diff --git a/apachesolr.index.inc b/apachesolr.index.inc
index 6cae64a..4cfbc05 100644
--- a/apachesolr.index.inc
+++ b/apachesolr.index.inc
@@ -139,7 +139,8 @@ function apachesolr_index_status($env_id) {
         ->condition(db_and()
           ->condition('aie.changed', $last_changed, '<=')
           ->condition('aie.entity_id', $last_entity_id, '>')))
-      ->orderBy('aie.entity_id', 'ASC');
+      ->orderBy('aie.entity_id', 'ASC')
+      ->addTag('apachesolr_index_' . $entity_type);
 
 
     if ($table == 'apachesolr_index_entities') {
@@ -455,7 +456,8 @@ function apachesolr_index_get_entities_to_index($env_id, $entity_type, $limit) {
       ->condition(db_and()
         ->condition('aie.changed', $last_changed, '<=')
         ->condition('aie.entity_id', $last_entity_id, '>')))
-    ->orderBy('aie.entity_id', 'ASC');
+    ->orderBy('aie.entity_id', 'ASC')
+    ->addTag('apachesolr_index_' . $entity_type);
 
   if ($table == 'apachesolr_index_entities') {
     // Other, entity-specific tables don't need this condition.
@@ -1227,7 +1229,8 @@ function apachesolr_index_node_check_table() {
   $query = db_select($table, 'aien')
     ->fields('n', array('nid', 'status'))
     ->where('aien.status <> n.status')
-    ->range(0, ($limit*2));
+    ->range(0, ($limit * 2))
+    ->addTag('apachesolr_index_node');
   $query->innerJoin('node', 'n', 'n.nid = aien.entity_id');
   $nodes = $query->execute()->fetchAllAssoc('nid');