@@ -115,7 +115,7 @@ def solr_delete_by_query(queries)
     end
 
     def rebuild_index(url=Chef::Config[:couchdb_url], db=Chef::Config[:couchdb_database])
-      solr_delete_by_query("*:*")
+      solr_delete_by_query("X_CHEF_database_CHEF_X:#{db}")
       solr_commit
 
       results = {}
 
@@ -49,7 +49,7 @@ def with_indexer_metadata(with_metadata={})
 
         with_metadata["type"]     ||= index_object_type
         with_metadata["database"] ||= Chef::Config[:couchdb_database]
-        with_metadata["id"]         = couchdb_id || UUIDTools::UUID.random_create.to_s
+        with_metadata["id"]       ||= (couchdb_id || UUIDTools::UUID.random_create.to_s)
         with_metadata["item"]       = self
         with_metadata
       end