Index: search.extender.inc
===================================================================
--- search.extender.inc	(revision 148)
+++ search.extender.inc	(working copy)
@@ -138,6 +138,10 @@
     $this->searchExpression = $expression;
     $this->type = $module;
 
+    // Add tag to identify this as a search query and which type
+    $this->addTag('search');
+    $this->addTag("search_$module");
+
     return $this;
   }
 
@@ -359,6 +363,8 @@
       ->fetchField();
 
     if ($this->normalize) {
+      // Add useful metadata.
+      $this->addMetaData('normalize', $this->normalize);
       return TRUE;
     }
     return FALSE;
@@ -442,11 +448,8 @@
       $this->orderBy('calculated_score', 'DESC');
     }
 
-    // Add tag and useful metadata.
-    $this
-      ->addTag('search_' . $this->type)
-      ->addMetaData('normalize', $this->normalize)
-      ->fields('i', array('type', 'sid'));
+    // Add required return fields.
+    $this->fields('i', array('type', 'sid'));
 
     return $this->query->execute();
   }