diff --git a/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php
index 857783f811..79f395ebaa 100644
--- a/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php
+++ b/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php
@@ -9,11 +9,11 @@ final class PhabricatorProjectsFulltextEngineExtension
     return pht('Projects');
   }
 
-  public function shouldIndexFulltextObject($object) {
+  public function shouldEnrichFulltextObject($object) {
     return ($object instanceof PhabricatorProjectInterface);
   }
 
-  public function indexFulltextObject(
+  public function enrichFulltextObject(
     $object,
     PhabricatorSearchAbstractDocument $document) {
 
diff --git a/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php
index 9cbe384a10..1626d248da 100644
--- a/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php
@@ -9,7 +9,7 @@ final class PhabricatorLiskFulltextEngineExtension
     return pht('Lisk Builtin Properties');
   }
 
-  public function shouldIndexFulltextObject($object) {
+  public function shouldEnrichFulltextObject($object) {
     if (!($object instanceof PhabricatorLiskDAO)) {
       return false;
     }
@@ -21,7 +21,7 @@ final class PhabricatorLiskFulltextEngineExtension
     return true;
   }
 
-  public function indexFulltextObject(
+  public function enrichFulltextObject(
     $object,
     PhabricatorSearchAbstractDocument $document) {
 
diff --git a/src/applications/search/index/PhabricatorFulltextEngine.php b/src/applications/search/index/PhabricatorFulltextEngine.php
index 9f20917b3f..e1b2f4471d 100644
--- a/src/applications/search/index/PhabricatorFulltextEngine.php
+++ b/src/applications/search/index/PhabricatorFulltextEngine.php
@@ -26,9 +26,16 @@ abstract class PhabricatorFulltextEngine
     $object = $this->getObject();
 
     $extensions = PhabricatorFulltextEngineExtension::getAllExtensions();
+
+    $enrich_extensions = array();
+    $index_extensions = array();
     foreach ($extensions as $key => $extension) {
-      if (!$extension->shouldIndexFulltextObject($object)) {
-        unset($extensions[$key]);
+      if ($extension->shouldEnrichFulltextObject($object)) {
+        $enrich_extensions[] = $extension;
+      }
+
+      if ($extension->shouldIndexFulltextObject($object)) {
+        $index_extensions[] = $extension;
       }
     }
 
@@ -36,7 +43,11 @@ abstract class PhabricatorFulltextEngine
 
     $this->buildAbstractDocument($document, $object);
 
-    foreach ($extensions as $extension) {
+    foreach ($enrich_extensions as $extension) {
+      $extension->enrichFulltextObject($object, $document);
+    }
+
+    foreach ($index_extensions as $extension) {
       $extension->indexFulltextObject($object, $document);
     }
 
diff --git a/src/applications/search/index/PhabricatorFulltextEngineExtension.php b/src/applications/search/index/PhabricatorFulltextEngineExtension.php
index c52b35a58a..52aabe7c8b 100644
--- a/src/applications/search/index/PhabricatorFulltextEngineExtension.php
+++ b/src/applications/search/index/PhabricatorFulltextEngineExtension.php
@@ -12,11 +12,25 @@ abstract class PhabricatorFulltextEngineExtension extends Phobject {
 
   abstract public function getExtensionName();
 
-  abstract public function shouldIndexFulltextObject($object);
+  public function shouldEnrichFulltextObject($object) {
+    return false;
+  }
 
-  abstract public function indexFulltextObject(
+  public function enrichFulltextObject(
     $object,
-    PhabricatorSearchAbstractDocument $document);
+    PhabricatorSearchAbstractDocument $document) {
+    return;
+  }
+
+  public function shouldIndexFulltextObject($object) {
+    return false;
+  }
+
+  public function indexFulltextObject(
+    $object,
+    PhabricatorSearchAbstractDocument $document) {
+    return;
+  }
 
   final public static function getAllExtensions() {
     return id(new PhutilClassMapQuery())
diff --git a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php
index 3c25618ebe..e7876136a1 100644
--- a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php
+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php
@@ -9,11 +9,11 @@ final class PhabricatorSubscriptionsFulltextEngineExtension
     return pht('Subscribers');
   }
 
-  public function shouldIndexFulltextObject($object) {
+  public function shouldEnrichFulltextObject($object) {
     return ($object instanceof PhabricatorSubscribableInterface);
   }
 
-  public function indexFulltextObject(
+  public function enrichFulltextObject(
     $object,
     PhabricatorSearchAbstractDocument $document) {
 
diff --git a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
index b95fc0167a..701ad34ca7 100644
--- a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
@@ -9,11 +9,11 @@ final class PhabricatorTransactionsFulltextEngineExtension
     return pht('Comments');
   }
 
-  public function shouldIndexFulltextObject($object) {
+  public function shouldEnrichFulltextObject($object) {
     return ($object instanceof PhabricatorApplicationTransactionInterface);
   }
 
-  public function indexFulltextObject(
+  public function enrichFulltextObject(
     $object,
     PhabricatorSearchAbstractDocument $document) {
 
diff --git a/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php
index 8186ff5311..9e0684cacc 100644
--- a/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php
+++ b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php
@@ -9,11 +9,11 @@ final class PhabricatorCustomFieldFulltextEngineExtension
     return pht('Custom Fields');
   }
 
-  public function shouldIndexFulltextObject($object) {
+  public function shouldEnrichFulltextObject($object) {
     return ($object instanceof PhabricatorCustomFieldInterface);
   }
 
-  public function indexFulltextObject(
+  public function enrichFulltextObject(
     $object,
     PhabricatorSearchAbstractDocument $document) {