diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java
index e59e42e84c6..dfc1a9b31d9 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java
@@ -32,6 +32,7 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.rest.RestStatus;
@@ -435,7 +436,10 @@ public class ElasticSearchEventPublisher extends AbstractEventPublisher {
     if (event.getEventType() == EventType.ENTITY_DELETED) {
       Database database = (Database) event.getEntity();
       DeleteByQueryRequest request = new DeleteByQueryRequest(ElasticSearchIndexType.TABLE_SEARCH_INDEX.indexName);
-      request.setQuery(new TermQueryBuilder("database", database.getName()));
+      BoolQueryBuilder queryBuilder = new BoolQueryBuilder();
+      queryBuilder.must(new TermQueryBuilder("database", database.getName()));
+      queryBuilder.must(new TermQueryBuilder("service", database.getService()));
+      request.setQuery(queryBuilder);
       deleteEntityFromElasticSearchByQuery(request);
     }
   }
@@ -444,7 +448,10 @@ public class ElasticSearchEventPublisher extends AbstractEventPublisher {
     if (event.getEventType() == EventType.ENTITY_DELETED) {
       DatabaseSchema databaseSchema = (DatabaseSchema) event.getEntity();
       DeleteByQueryRequest request = new DeleteByQueryRequest(ElasticSearchIndexType.TABLE_SEARCH_INDEX.indexName);
-      request.setQuery(new TermQueryBuilder("database_schema", databaseSchema.getName()));
+      BoolQueryBuilder queryBuilder = new BoolQueryBuilder();
+      queryBuilder.must(new TermQueryBuilder("database_schema", databaseSchema.getName()));
+      queryBuilder.must(new TermQueryBuilder("database", databaseSchema.getDatabase().getName()));
+      request.setQuery(queryBuilder);
       deleteEntityFromElasticSearchByQuery(request);
     }
   }
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
index 6b8254d1d42..b2cdc8fd9c5 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
@@ -169,10 +169,10 @@ public class SearchResource {
         break;
     }
 
-    if (nullOrEmpty(sortFieldParam)) {
+    if (!nullOrEmpty(sortFieldParam)) {
       searchSourceBuilder.sort(sortFieldParam, sortOrder);
     }
-    LOG.info(searchSourceBuilder.toString());
+    LOG.debug(searchSourceBuilder.toString());
     searchSourceBuilder.timeout(new TimeValue(30, TimeUnit.SECONDS));
     searchRequest.source(searchSourceBuilder);
     SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);