diff --git a/scripts/daemon/phabricator_daemon_launcher.php b/scripts/daemon/phabricator_daemon_launcher.php
index 7b21d1634e..5bcb312005 100755
--- a/scripts/daemon/phabricator_daemon_launcher.php
+++ b/scripts/daemon/phabricator_daemon_launcher.php
@@ -1,260 +1,260 @@
 #!/usr/bin/env php
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 require_once $root.'/scripts/__init_env__.php';
 
 phutil_require_module('phabricator', 'infrastructure/daemon/control');
 $control = new PhabricatorDaemonControl();
 
 $phd_dir = PhabricatorEnv::getEnvConfig('phd.pid-directory');
 $pid_dir = $phd_dir.'/pid';
 
 switch (isset($argv[1]) ? $argv[1] : 'help') {
   case 'list':
     $err = $control->executeListCommand();
     exit($err);
 
   case 'status':
     $err = $control->executeStatusCommand();
     exit($err);
 
   case 'stop':
     $err = $control->executeStopCommand();
     exit($err);
 
   case 'repository-launch-readonly':
     $need_launch = phd_load_tracked_repositories_of_type('git');
     if (!$need_launch) {
       echo "There are no repositories with tracking enabled.\n";
     } else {
       foreach ($need_launch as $repository) {
         $name = $repository->getName();
         $callsign = $repository->getCallsign();
         $desc = "'{$name}' ({$callsign})";
         $phid = $repository->getPHID();
 
-        echo "Launching 'git pull' daemon on the {$desc} repository...\n";
+        echo "Launching 'git fetch' daemon on the {$desc} repository...\n";
         $control->launchDaemon(
           'PhabricatorRepositoryGitFetchDaemon',
           array(
             $phid,
           ));
       }
     }
     break;
 
   case 'repository-launch-master':
     $need_launch = phd_load_tracked_repositories();
     if (!$need_launch) {
       echo "There are no repositories with tracking enabled.\n";
     } else {
       foreach ($need_launch as $repository) {
         $name = $repository->getName();
         $callsign = $repository->getCallsign();
         $desc = "'{$name}' ({$callsign})";
         $phid = $repository->getPHID();
 
         switch ($repository->getVersionControlSystem()) {
           case 'git':
             echo "Launching 'git fetch' daemon on the {$desc} repository...\n";
             $control->launchDaemon(
-              'PhabricatorRepositoryGitPullDaemon',
+              'PhabricatorRepositoryGitFetchDaemon',
               array(
                 $phid,
               ));
             echo "Launching discovery daemon on the {$desc} repository...\n";
             $control->launchDaemon(
               'PhabricatorRepositoryGitCommitDiscoveryDaemon',
               array(
                 $phid,
               ));
             break;
           case 'svn':
             echo "Launching discovery daemon on the {$desc} repository...\n";
             $control->launchDaemon(
               'PhabricatorRepositorySvnCommitDiscoveryDaemon',
               array(
                 $phid,
               ));
             break;
         }
       }
 
       echo "Launching CommitTask daemon...\n";
       $control->launchDaemon(
         'PhabricatorRepositoryCommitTaskDaemon',
         array());
 
       echo "Done.\n";
     }
     break;
 
   case 'launch':
     $daemon = idx($argv, 2);
     if (!$daemon) {
       throw new Exception("Daemon name required!");
     }
 
     $pass_argv = array_slice($argv, 3);
 
     $n = 1;
     if (is_numeric($daemon)) {
       $n = $daemon;
       if ($n < 1) {
         throw new Exception("Count must be at least 1!");
       }
       $daemon = idx($argv, 3);
       if (!$daemon) {
         throw new Exception("Daemon name required!");
       }
       $pass_argv = array_slice($argv, 4);
     }
 
     $loader = new PhutilSymbolLoader();
     $symbols = $loader
       ->setAncestorClass('PhutilDaemon')
       ->selectSymbolsWithoutLoading();
 
     $symbols = ipull($symbols, 'name');
     $match = array();
     foreach ($symbols as $symbol) {
       if (stripos($symbol, $daemon) !== false) {
         if (strtolower($symbol) == strtolower($daemon)) {
           $match = array($symbol);
           break;
         } else {
           $match[] = $symbol;
         }
       }
     }
 
     if (count($match) == 0) {
       throw new Exception(
         "No daemons match! Use 'phd list' for a list of daemons.");
     } else if (count($match) > 1) {
       throw new Exception(
         "Which of these daemons did you mean?\n".
         "    ".implode("\n    ", $match));
     } else {
       $daemon = reset($match);
     }
 
     echo "Launching {$n} x {$daemon}";
 
     for ($ii = 0; $ii < $n; $ii++) {
       $control->launchDaemon($daemon, $pass_argv);
       echo ".";
     }
 
     echo "\n";
     echo "Done.\n";
 
     break;
 
   case 'parse-commit':
     $commit = isset($argv[2]) ? $argv[2] : null;
     if (!$commit) {
       throw new Exception("Provide a commit to parse!");
     }
     $matches = null;
     if (!preg_match('/r([A-Z]+)([a-z0-9]+)/', $commit, $matches)) {
       throw new Exception("Can't parse commit identifier!");
     }
     $repo = id(new PhabricatorRepository())->loadOneWhere(
       'callsign = %s',
       $matches[1]);
     if (!$repo) {
       throw new Exception("Unknown repository!");
     }
     $commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
       'repositoryID = %d AND commitIdentifier = %s',
       $repo->getID(),
       $matches[2]);
     if (!$commit) {
       throw new Exception('Unknown commit.');
     }
 
     $workers = array();
 
 
     switch ($repo->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         $workers[] = new PhabricatorRepositoryGitCommitMessageParserWorker(
           $commit->getID());
         $workers[] = new PhabricatorRepositoryGitCommitChangeParserWorker(
           $commit->getID());
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
         $workers[] = new PhabricatorRepositorySvnCommitMessageParserWorker(
           $commit->getID());
         $workers[] = new PhabricatorRepositorySvnCommitChangeParserWorker(
           $commit->getID());
         break;
       default:
         throw new Exception("Unknown repository type!");
     }
 
     ExecFuture::pushEchoMode(true);
 
     foreach ($workers as $worker) {
       echo "Running ".get_class($worker)."...\n";
       $worker->doWork();
     }
 
     echo "Done.\n";
 
     break;
   case '--help':
   case 'help':
   default:
     $err = $control->executeHelpCommand();
     exit($err);
 }
 
 function phd_load_tracked_repositories_of_type($type) {
   $repositories = phd_load_tracked_repositories();
 
   foreach ($repositories as $key => $repository) {
     if ($repository->getVersionControlSystem() != $type) {
       unset($repositories[$key]);
     }
   }
 
   return $repositories;
 }
 
 function phd_load_tracked_repositories() {
   phutil_require_module(
     'phabricator',
     'applications/repository/storage/repository');
 
   $repositories = id(new PhabricatorRepository())->loadAll();
   foreach ($repositories as $key => $repository) {
     if (!$repository->getDetail('tracking-enabled')) {
       unset($repositories[$key]);
     }
   }
 
   return $repositories;
 }
 
 
 
diff --git a/src/applications/search/controller/search/PhabricatorSearchController.php b/src/applications/search/controller/search/PhabricatorSearchController.php
index 037c7ec114..3a38d4b8f9 100644
--- a/src/applications/search/controller/search/PhabricatorSearchController.php
+++ b/src/applications/search/controller/search/PhabricatorSearchController.php
@@ -1,206 +1,206 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 class PhabricatorSearchController extends PhabricatorSearchBaseController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     if ($this->id) {
       $query = id(new PhabricatorSearchQuery())->load($this->id);
       if (!$query) {
         return new Aphront404Response();
       }
     } else {
       $query = new PhabricatorSearchQuery();
 
       if ($request->isFormPost()) {
         $query->setQuery($request->getStr('query'));
 
         if (strlen($request->getStr('type'))) {
           $query->setParameter('type', $request->getStr('type'));
         }
 
         if ($request->getArr('author')) {
           $query->setParameter('author', $request->getArr('author'));
         }
 
         if ($request->getArr('owner')) {
           $query->setParameter('owner', $request->getArr('owner'));
         }
 
         if ($request->getInt('open')) {
           $query->setParameter('open', $request->getInt('open'));
         }
 
         if ($request->getArr('project')) {
           $query->setParameter('project', $request->getArr('project'));
         }
 
         $query->save();
         return id(new AphrontRedirectResponse())
           ->setURI('/search/'.$query->getID().'/');
       }
     }
 
     $more = PhabricatorEnv::getEnvConfig('search.more-document-types', array());
 
     $options = array(
       '' => 'All Documents',
       PhabricatorPHIDConstants::PHID_TYPE_DREV => 'Differential Revisions',
       PhabricatorPHIDConstants::PHID_TYPE_TASK => 'Maniphest Tasks',
     ) + $more;
 
     $status_options = array(
       0 => 'Open and Closed Documents',
       1 => 'Open Documents',
     );
 
     $phids = array_merge(
       $query->getParameter('author', array()),
       $query->getParameter('owner', array()),
       $query->getParameter('project', array())
     );
 
     $handles = id(new PhabricatorObjectHandleData($phids))
       ->loadHandles();
 
     $author_value = array_select_keys(
       $handles,
       $query->getParameter('author', array()));
     $author_value = mpull($author_value, 'getFullName', 'getPHID');
 
     $owner_value = array_select_keys(
       $handles,
       $query->getParameter('owner', array()));
     $owner_value = mpull($owner_value, 'getFullName', 'getPHID');
 
     $project_value = array_select_keys(
       $handles,
       $query->getParameter('project', array()));
     $project_value = mpull($project_value, 'getFullName', 'getPHID');
 
     $search_form = new AphrontFormView();
     $search_form
       ->setUser($user)
       ->setAction('/search/')
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel('Search')
           ->setName('query')
           ->setValue($query->getQuery()))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel('Document Type')
           ->setName('type')
           ->setOptions($options)
           ->setValue($query->getParameter('type')))
       ->appendChild(
         id(new AphrontFormSelectControl())
           ->setLabel('Document Status')
           ->setName('open')
           ->setOptions($status_options)
           ->setValue($query->getParameter('open')))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setName('author')
           ->setLabel('Author')
           ->setDatasource('/typeahead/common/users/')
           ->setValue($author_value))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setName('owner')
           ->setLabel('Owner')
           ->setDatasource('/typeahead/common/searchowner/')
           ->setValue($owner_value)
           ->setCaption(
             'Tip: search for "Up For Grabs" to find unowned documents.'))
       ->appendChild(
         id(new AphrontFormTokenizerControl())
           ->setName('project')
           ->setLabel('Project')
           ->setDatasource('/typeahead/common/projects/')
           ->setValue($project_value))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue('Search'));
 
     $search_panel = new AphrontPanelView();
     $search_panel->setHeader('Search Phabricator');
     $search_panel->appendChild($search_form);
 
     if ($query->getID()) {
       $executor = new PhabricatorSearchMySQLExecutor();
       $results = $executor->executeSearch($query);
       $results = ipull($results, 'phid');
       $handles = id(new PhabricatorObjectHandleData($results))
         ->loadHandles();
       $results = array();
       foreach ($handles as $handle) {
         $results[] =
           '<h1 style="font-size: 14px; font-weight: normal; margin: 4px 0 8px;">'.
             phutil_render_tag(
               'a',
               array(
                 'href' => $handle->getURI(),
               ),
               $this->emboldenQuery($handle->getName(), $query->getQuery())).
           '</h1>';
       }
       $results =
         '<div style="padding: 1em 3em 2em;">'.
           implode("\n", $results).
         '</div>';
     } else {
       $results = null;
     }
 
     $results = print_r($results, true);
 
     return $this->buildStandardPageResponse(
       array(
         $search_panel,
         $results,
       ),
       array(
         'title' => 'Results: what',
       ));
   }
 
   private function emboldenQuery($str, $query) {
     $query = preg_split("/\s+/", $query);
     $query = array_filter($query);
     $str = phutil_escape_html($str);
     foreach ($query as $word) {
       $word = phutil_escape_html($word);
       $str = preg_replace(
-        '/('.preg_quote($word, '/').')/i',
+        '/(?:^|\b)('.preg_quote($word, '/').')(?:\b|$)/i',
         '<strong>\1</strong>',
         $str);
     }
     return $str;
   }
 
 }