diff --git a/apachesolr.index.inc b/apachesolr.index.inc
index 1ba7852..31b4486 100644
--- a/apachesolr.index.inc
+++ b/apachesolr.index.inc
@@ -88,9 +88,8 @@ function apachesolr_index_status($env_id) {
     $query = "SELECT count(*)
      FROM {{$table}} aie
      WHERE (aie.bundle IN (" . db_placeholders($bundles, 'varchar') . "))
-     AND (aie.entity_type = '%s')
      AND ((aie.changed > %d) OR ((aie.changed <= %d) AND (aie.entity_id > %d)))";
-    $arguments = array_merge($bundles, array($entity_type, $last_changed, $last_changed, $last_entity_id));
+    $arguments = array_merge($bundles, array($last_changed, $last_changed, $last_entity_id));
     if ($table == 'apachesolr_index_entities') {
       // Other, entity-specific tables don't need this condition.
       $query .= " AND aie.entity_type = '%s'";
diff --git a/apachesolr.module b/apachesolr.module
index a0462e3..e64a42a 100644
--- a/apachesolr.module
+++ b/apachesolr.module
@@ -2694,7 +2694,8 @@ function apachesolr_ctools_environment_export($environment, $indent) {
 
   $index_bundles = array();
 
-  if ($bundles = apachesolr_get_index_bundles($environment->env_id, 'node')) {
+  $type = 'node';
+  if ($bundles = apachesolr_get_index_bundles($environment->env_id, $type)) {
     $index_bundles[$type] = $bundles;
   }
   $additions_top = array();