diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,7 +8,7 @@
 return array(
   'names' => array(
     'core.pkg.css' => 'c0818fbb',
-    'core.pkg.js' => '14887b3d',
+    'core.pkg.js' => '7c8455ef',
     'darkconsole.pkg.js' => 'df001cab',
     'differential.pkg.css' => '4a93db37',
     'differential.pkg.js' => 'eb182ccd',
@@ -212,7 +212,7 @@
     'rsrc/externals/javelin/lib/behavior.js' => '61cbc29a',
     'rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js' => 'a5b67173',
     'rsrc/externals/javelin/lib/control/typeahead/Typeahead.js' => 'e614d22b',
-    'rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js' => 'aa93c7b0',
+    'rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js' => '1c22377d',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '503e17fd',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => '8b3fd187',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '54f314a0',
@@ -681,7 +681,7 @@
     'javelin-tokenizer' => 'a5b67173',
     'javelin-typeahead' => 'e614d22b',
     'javelin-typeahead-composite-source' => '503e17fd',
-    'javelin-typeahead-normalizer' => 'aa93c7b0',
+    'javelin-typeahead-normalizer' => '1c22377d',
     'javelin-typeahead-ondemand-source' => '8b3fd187',
     'javelin-typeahead-preloaded-source' => '54f314a0',
     'javelin-typeahead-source' => 'fcba4ecc',
@@ -967,6 +967,9 @@
       'javelin-util',
       'phabricator-keyboard-shortcut-manager',
     ),
+    '1c22377d' => array(
+      'javelin-install',
+    ),
     '1def2711' => array(
       'javelin-install',
       'javelin-dom',
@@ -1515,9 +1518,6 @@
       'javelin-util',
       'phabricator-prefab',
     ),
-    'aa93c7b0' => array(
-      'javelin-install',
-    ),
     'ab836011' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -133,8 +133,6 @@
           ->setProjectPHID($object->getPHID())
           ->save();
 
-        $object->updateDatasourceTokens();
-
         // TODO -- delete all of the below once we sever automagical project
         // to phriction stuff
         if ($xaction->getOldValue() === null) {
@@ -193,8 +191,6 @@
           }
         }
 
-        $object->updateDatasourceTokens();
-
         return;
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
diff --git a/src/applications/project/search/PhabricatorProjectSearchIndexer.php b/src/applications/project/search/PhabricatorProjectSearchIndexer.php
--- a/src/applications/project/search/PhabricatorProjectSearchIndexer.php
+++ b/src/applications/project/search/PhabricatorProjectSearchIndexer.php
@@ -9,6 +9,7 @@
 
   protected function buildAbstractDocumentByPHID($phid) {
     $project = $this->loadDocumentByPHID($phid);
+    $project->updateDatasourceTokens();
 
     $doc = new PhabricatorSearchAbstractDocument();
     $doc->setPHID($project->getPHID());
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
@@ -74,7 +74,7 @@
       return array();
     }
 
-    $tokens = preg_split('/\s+/', $string);
+    $tokens = preg_split('/\s+|-/', $string);
     return array_unique($tokens);
   }
 
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js
@@ -16,7 +16,8 @@
     normalize : function(str) {
       return ('' + str)
         .toLocaleLowerCase()
-        .replace(/[\.,-\/#!$%\^&\*;:{}=\-_`~()]/g, '')
+        .replace(/[\.,\/#!$%\^&\*;:{}=_`~()]/g, '')
+        .replace(/-/g, ' ')
         .replace(/ +/g, ' ')
         .replace(/^\s*|\s*$/g, '');
     }