diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
index d4d5b03ea5..62b9572d3c 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
@@ -195,13 +195,14 @@ public class SearchRequestHandlerTest extends AbstractTestNGSpringContextTests {
     // Filters
     Collection<AggregationBuilder> aggBuilders =
         sourceBuilder.aggregations().getAggregatorFactories();
-    // Expect 3 aggregations: textFieldOverride, missing␝textFieldOverride, and _index
-    assertEquals(aggBuilders.size(), 3);
+    // Expect 3 aggregations: textFieldOverride, missing␝textFieldOverride, and _entityType,
+    // _entityType␝typeNames
+    assertEquals(aggBuilders.size(), 4);
     for (AggregationBuilder aggBuilder : aggBuilders) {
-      if (aggBuilder.getName().equals("textFieldOverride")) {
+      if (aggBuilder.getName().startsWith("textFieldOverride")) {
         TermsAggregationBuilder filterPanelBuilder = (TermsAggregationBuilder) aggBuilder;
         assertEquals(filterPanelBuilder.field(), "textFieldOverride.keyword");
-      } else if (!aggBuilder.getName().equals("_entityType")
+      } else if (!aggBuilder.getName().startsWith("_entityType")
           && !aggBuilder
               .getName()
               .equals(
@@ -241,13 +242,14 @@ public class SearchRequestHandlerTest extends AbstractTestNGSpringContextTests {
     // Filters
     Collection<AggregationBuilder> aggBuilders =
         sourceBuilder.aggregations().getAggregatorFactories();
-    // Expect 2 aggregations: textFieldOverride and _index
-    assertEquals(aggBuilders.size(), 3);
+    // Expect 4 aggregations: textFieldOverride, missing:textFieldOverride, _entityType and
+    // _entityType:typeNames
+    assertEquals(aggBuilders.size(), 4);
     for (AggregationBuilder aggBuilder : aggBuilders) {
-      if (aggBuilder.getName().equals("textFieldOverride")) {
+      if (aggBuilder.getName().startsWith("textFieldOverride")) {
         TermsAggregationBuilder filterPanelBuilder = (TermsAggregationBuilder) aggBuilder;
         assertEquals(filterPanelBuilder.field(), "textFieldOverride.keyword");
-      } else if (!aggBuilder.getName().equals("_entityType")
+      } else if (!aggBuilder.getName().startsWith("_entityType")
           && !aggBuilder
               .getName()
               .equals(