diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index d1da55268a50d5..079a20619d1eab 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -67,6 +67,7 @@
 import com.linkedin.datahub.graphql.generated.EntityPath;
 import com.linkedin.datahub.graphql.generated.EntityRelationship;
 import com.linkedin.datahub.graphql.generated.EntityRelationshipLegacy;
+import com.linkedin.datahub.graphql.generated.FacetMetadata;
 import com.linkedin.datahub.graphql.generated.ForeignKeyConstraint;
 import com.linkedin.datahub.graphql.generated.FormActorAssignment;
 import com.linkedin.datahub.graphql.generated.FreshnessContract;
@@ -1474,6 +1475,19 @@ private void configureGenericEntityResolvers(final RuntimeWiring.Builder builder
                     "entity",
                     new EntityTypeResolver(
                         entityTypes, (env) -> ((BrowsePathEntry) env.getSource()).getEntity())))
+        .type(
+            "FacetMetadata",
+            typeWiring ->
+                typeWiring.dataFetcher(
+                    "entity",
+                    new EntityTypeResolver(
+                        entityTypes,
+                        (env) -> {
+                          FacetMetadata facetMetadata = env.getSource();
+                          return facetMetadata.getEntity() != null
+                              ? facetMetadata.getEntity()
+                              : null;
+                        })))
         .type(
             "LineageRelationship",
             typeWiring ->
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
index 29b71d95ad9749..e84841ca42be57 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
@@ -66,11 +66,17 @@ public CompletableFuture<AggregateResults> get(DataFetchingEnvironment environme
 
           final Filter inputFilter = ResolverUtils.buildFilter(null, input.getOrFilters());
 
-          final SearchFlags searchFlags = mapInputFlags(context, input.getSearchFlags());
+          final SearchFlags searchFlags =
+              input.getSearchFlags() != null
+                  ? mapInputFlags(context, input.getSearchFlags())
+                  : new SearchFlags();
 
           final List<String> facets =
               input.getFacets() != null && input.getFacets().size() > 0 ? input.getFacets() : null;
 
+            // do not include default facets if we're requesting any facets specifically
+          searchFlags.setIncludeDefaultFacets(facets == null || facets.size() <= 0);
+
           List<String> finalEntities =
               maybeResolvedView != null
                   ? SearchUtils.intersectEntityTypes(
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
index d103704146d399..d9690ab23b3ef7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
@@ -2,19 +2,29 @@
 
 import static com.linkedin.datahub.graphql.resolvers.ResolverUtils.bindArgument;
 import static com.linkedin.datahub.graphql.resolvers.search.SearchUtils.*;
+import static com.linkedin.datahub.graphql.resolvers.search.SearchUtils.getEntityNames;
 
+import com.google.common.collect.ImmutableList;
 import com.linkedin.common.urn.UrnUtils;
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.concurrency.GraphQLConcurrencyUtils;
+import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.SearchAcrossEntitiesInput;
 import com.linkedin.datahub.graphql.generated.SearchResults;
 import com.linkedin.datahub.graphql.resolvers.ResolverUtils;
 import com.linkedin.datahub.graphql.types.mappers.UrnSearchResultsMapper;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.metadata.query.SearchFlags;
+import com.linkedin.metadata.query.filter.Condition;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
+import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
+import com.linkedin.metadata.query.filter.CriterionArray;
 import com.linkedin.metadata.query.filter.Filter;
 import com.linkedin.metadata.query.filter.SortCriterion;
+import com.linkedin.metadata.search.SearchResult;
+import com.linkedin.metadata.service.FormService;
 import com.linkedin.metadata.service.ViewService;
+import com.linkedin.metadata.utils.CriterionUtils;
 import com.linkedin.view.DataHubViewInfo;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
@@ -64,24 +74,7 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
               ResolverUtils.buildFilter(input.getFilters(), input.getOrFilters());
 
           SearchFlags searchFlags = mapInputFlags(context, input.getSearchFlags());
-          List<SortCriterion> sortCriteria;
-          if (input.getSortInput() != null) {
-            if (input.getSortInput().getSortCriteria() != null) {
-              sortCriteria =
-                  input.getSortInput().getSortCriteria().stream()
-                      .map(SearchUtils::mapSortCriterion)
-                      .collect(Collectors.toList());
-            } else {
-              sortCriteria =
-                  input.getSortInput().getSortCriterion() != null
-                      ? Collections.singletonList(
-                          mapSortCriterion(input.getSortInput().getSortCriterion()))
-                      : Collections.emptyList();
-            }
-
-          } else {
-            sortCriteria = Collections.emptyList();
-          }
+          List<SortCriterion> sortCriteria = SearchUtils.getSortCriteria(input.getSortInput());
 
           try {
             log.debug(
@@ -101,6 +94,14 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
               return SearchUtils.createEmptySearchResults(start, count);
             }
 
+            boolean shouldIncludeStructuredPropertyFacets =
+                input.getSearchFlags() != null
+                        && input.getSearchFlags().getIncludeStructuredPropertyFacets() != null
+                    ? input.getSearchFlags().getIncludeStructuredPropertyFacets()
+                    : false;
+            List<String> structuredPropertyFacets =
+                shouldIncludeStructuredPropertyFacets ? getStructuredPropertyFacets(context) : null;
+
             return UrnSearchResultsMapper.map(
                 context,
                 _entityClient.searchAcrossEntities(
@@ -113,7 +114,8 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
                         : baseFilter,
                     start,
                     count,
-                    sortCriteria));
+                    sortCriteria,
+                    structuredPropertyFacets));
           } catch (Exception e) {
             log.error(
                 "Failed to execute search for multiple entities: entity types {}, query {}, filters: {}, start: {}, count: {}",
@@ -133,4 +135,45 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
         this.getClass().getSimpleName(),
         "get");
   }
+
+  private List<String> getStructuredPropertyFacets(final QueryContext context) {
+    try {
+      SearchFlags searchFlags = new SearchFlags().setSkipCache(true);
+      SearchResult result =
+          _entityClient.searchAcrossEntities(
+              context.getOperationContext().withSearchFlags(flags -> searchFlags),
+              getEntityNames(ImmutableList.of(EntityType.STRUCTURED_PROPERTY)),
+              "*",
+              createStructuredPropertyFilter(),
+              0,
+              100,
+              Collections.emptyList(),
+              null);
+      return result.getEntities().stream()
+          .map(entity -> String.format("structuredProperties.%s", entity.getEntity().getId()))
+          .collect(Collectors.toList());
+    } catch (Exception e) {
+      log.error("Failed to get structured property facets to filter on", e);
+      return Collections.emptyList();
+    }
+  }
+
+  private Filter createStructuredPropertyFilter() {
+    return new Filter()
+        .setOr(
+            new ConjunctiveCriterionArray(
+                ImmutableList.of(
+                    new ConjunctiveCriterion()
+                        .setAnd(
+                            new CriterionArray(
+                                ImmutableList.of(
+                                    CriterionUtils.buildCriterion(
+                                        "filterStatus", Condition.EQUAL, "ENABLED")))),
+                    new ConjunctiveCriterion()
+                        .setAnd(
+                            new CriterionArray(
+                                ImmutableList.of(
+                                    CriterionUtils.buildCriterion(
+                                        "showInSearchFilters", Condition.EQUAL, "true")))))));
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
index 04777c3fcdb4e2..a01b3aaec9c982 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
@@ -22,6 +22,7 @@
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.FacetFilterInput;
 import com.linkedin.datahub.graphql.generated.SearchResults;
+import com.linkedin.datahub.graphql.generated.SearchSortInput;
 import com.linkedin.datahub.graphql.types.common.mappers.SearchFlagsInputMapper;
 import com.linkedin.datahub.graphql.types.entitytype.EntityTypeMapper;
 import com.linkedin.metadata.query.SearchFlags;
@@ -326,4 +327,25 @@ public static SearchResults createEmptySearchResults(final int start, final int
     result.setFacets(new ArrayList<>());
     return result;
   }
+
+  public static List<SortCriterion> getSortCriteria(@Nullable final SearchSortInput sortInput) {
+    List<SortCriterion> sortCriteria;
+    if (sortInput != null) {
+      if (sortInput.getSortCriteria() != null) {
+        sortCriteria =
+            sortInput.getSortCriteria().stream()
+                .map(SearchUtils::mapSortCriterion)
+                .collect(Collectors.toList());
+      } else {
+        sortCriteria =
+            sortInput.getSortCriterion() != null
+                ? Collections.singletonList(mapSortCriterion(sortInput.getSortCriterion()))
+                : new ArrayList<>();
+      }
+    } else {
+      sortCriteria = new ArrayList<>();
+    }
+
+    return sortCriteria;
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
index 0d69e62c621a60..8fe58df2d2edec 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
@@ -70,6 +70,9 @@ public static FacetMetadata mapFacet(
         aggregationFacets.stream()
             .map(facet -> facet.equals("entity") || facet.contains("_entityType"))
             .collect(Collectors.toList());
+    if (aggregationMetadata.getEntity() != null) {
+      facetMetadata.setEntity(UrnToEntityMapper.map(context, aggregationMetadata.getEntity()));
+    }
     facetMetadata.setField(aggregationMetadata.getName());
     facetMetadata.setDisplayName(
         Optional.ofNullable(aggregationMetadata.getDisplayName())
diff --git a/datahub-graphql-core/src/main/resources/search.graphql b/datahub-graphql-core/src/main/resources/search.graphql
index d0f669f05f9598..82bfb9ee26fc42 100644
--- a/datahub-graphql-core/src/main/resources/search.graphql
+++ b/datahub-graphql-core/src/main/resources/search.graphql
@@ -167,6 +167,11 @@ input  SearchFlags {
   fields to include for custom Highlighting
   """
   customHighlightingFields: [String!]
+
+  """
+  Whether or not to fetch and request for structured property facets when doing a search
+  """
+  includeStructuredPropertyFacets: Boolean
 }
 
 """
@@ -872,6 +877,11 @@ type FacetMetadata {
   """
   displayName: String
 
+  """
+  Entity corresponding to the facet
+  """
+  entity: Entity
+
   """
   Aggregated search result counts by value of the field
   """
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 8a62982a253e18..2e474256f421ef 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -2204,7 +2204,7 @@ export const mocks = [
                     count: 10,
                     filters: [],
                     orFilters: [],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -2244,6 +2244,7 @@ export const mocks = [
                             field: 'origin',
                             displayName: 'origin',
                             aggregations: [{ value: 'PROD', count: 3, entity: null }],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -2252,6 +2253,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -2261,6 +2263,7 @@ export const mocks = [
                                 { value: 'MySQL', count: 1, entity: null },
                                 { value: 'Kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                     suggestions: [],
@@ -2290,7 +2293,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -2325,6 +2328,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -2333,6 +2337,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -2343,6 +2348,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                     suggestions: [],
@@ -2393,6 +2399,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -2401,6 +2408,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -2410,6 +2418,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -2464,7 +2473,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -2501,6 +2510,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -2510,6 +2520,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -2520,6 +2531,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null, __typename: 'AggregationMetadata' },
                                 { value: 'kafka', count: 1, entity: null, __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -2669,6 +2681,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -2677,6 +2690,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -2686,6 +2700,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -2743,6 +2758,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -2751,6 +2767,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -2760,6 +2777,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -2809,6 +2827,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -2822,6 +2841,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -2953,6 +2973,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -2966,6 +2987,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3050,6 +3072,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         // {
                         //     displayName: 'Domain',
@@ -3071,6 +3094,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -3096,6 +3120,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3181,7 +3206,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -3215,6 +3240,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -3228,6 +3254,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3256,7 +3283,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -3290,6 +3317,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -3298,6 +3326,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -3307,6 +3336,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3335,7 +3365,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -3377,6 +3407,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -3385,6 +3416,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -3394,6 +3426,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3428,7 +3461,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -3465,6 +3498,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -3474,6 +3508,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -3484,6 +3519,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null, __typename: 'AggregationMetadata' },
                                 { value: 'kafka', count: 1, entity: null, __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3518,7 +3554,7 @@ export const mocks = [
                             ],
                         },
                     ],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -3555,6 +3591,7 @@ export const mocks = [
                                     __typename: 'AggregationMetadata',
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -3564,6 +3601,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             __typename: 'FacetMetadata',
@@ -3574,6 +3612,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null, __typename: 'AggregationMetadata' },
                                 { value: 'kafka', count: 1, entity: null, __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                     ],
                 },
@@ -3724,7 +3763,7 @@ export const mocks = [
                     count: 10,
                     filters: [],
                     orFilters: [],
-                    searchFlags: { getSuggestions: true },
+                    searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
                 },
             },
         },
@@ -3823,6 +3862,7 @@ export const mocks = [
                                     entity: null,
                                 },
                             ],
+                            entity: null,
                         },
                         {
                             field: '_entityType',
@@ -3831,6 +3871,7 @@ export const mocks = [
                                 { count: 37, entity: null, value: 'DATASET', __typename: 'AggregationMetadata' },
                                 { count: 7, entity: null, value: 'CHART', __typename: 'AggregationMetadata' },
                             ],
+                            entity: null,
                         },
                         {
                             field: 'platform',
@@ -3840,6 +3881,7 @@ export const mocks = [
                                 { value: 'mysql', count: 1, entity: null },
                                 { value: 'kafka', count: 1, entity: null },
                             ],
+                            entity: null,
                         },
                     ],
                 },
diff --git a/datahub-web-react/src/app/buildEntityRegistry.ts b/datahub-web-react/src/app/buildEntityRegistry.ts
index 0b70986672be51..181ec7d328a587 100644
--- a/datahub-web-react/src/app/buildEntityRegistry.ts
+++ b/datahub-web-react/src/app/buildEntityRegistry.ts
@@ -24,6 +24,7 @@ import { RoleEntity } from './entity/Access/RoleEntity';
 import { RestrictedEntity } from './entity/restricted/RestrictedEntity';
 import { BusinessAttributeEntity } from './entity/businessAttribute/BusinessAttributeEntity';
 import { SchemaFieldPropertiesEntity } from './entity/schemaField/SchemaFieldPropertiesEntity';
+import { StructuredPropertyEntity } from './entity/structuredProperty/StructuredPropertyEntity';
 
 export default function buildEntityRegistry() {
     const registry = new EntityRegistry();
@@ -52,5 +53,6 @@ export default function buildEntityRegistry() {
     registry.register(new RestrictedEntity());
     registry.register(new BusinessAttributeEntity());
     registry.register(new SchemaFieldPropertiesEntity());
+    registry.register(new StructuredPropertyEntity());
     return registry;
 }
diff --git a/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx b/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx
new file mode 100644
index 00000000000000..cdcc391620ae7d
--- /dev/null
+++ b/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx
@@ -0,0 +1,88 @@
+import * as React from 'react';
+import styled from 'styled-components';
+import TableIcon from '@src/images/table-icon.svg?react';
+import { TYPE_ICON_CLASS_NAME } from '@src/app/shared/constants';
+import DefaultPreviewCard from '@src/app/preview/DefaultPreviewCard';
+import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '../../../types.generated';
+import { Entity, IconStyleType, PreviewType } from '../Entity';
+import { getDataForEntityType } from '../shared/containers/profile/utils';
+import { urlEncodeUrn } from '../shared/utils';
+
+const PreviewPropIcon = styled(TableIcon)`
+    font-size: 20px;
+`;
+
+/**
+ * Definition of the DataHub Structured Property entity.
+ */
+export class StructuredPropertyEntity implements Entity<StructuredProperty> {
+    type: EntityType = EntityType.StructuredProperty;
+
+    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
+        if (styleType === IconStyleType.TAB_VIEW) {
+            return <TableIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
+        }
+
+        if (styleType === IconStyleType.HIGHLIGHT) {
+            return <TableIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />;
+        }
+
+        return (
+            <TableIcon
+                className={TYPE_ICON_CLASS_NAME}
+                style={{
+                    fontSize,
+                    color: color || '#BFBFBF',
+                }}
+            />
+        );
+    };
+
+    isSearchEnabled = () => false;
+
+    isBrowseEnabled = () => false;
+
+    isLineageEnabled = () => false;
+
+    getAutoCompleteFieldName = () => 'name';
+
+    getGraphName = () => 'structuredProperty';
+
+    getPathName: () => string = () => this.getGraphName();
+
+    getCollectionName: () => string = () => 'Structured Properties';
+
+    getEntityName: () => string = () => 'Structured Property';
+
+    renderProfile: (urn: string) => JSX.Element = (_urn) => <div />; // not used right now
+
+    renderPreview = (previewType: PreviewType, data: StructuredProperty) => (
+        <DefaultPreviewCard
+            data={null}
+            description={data.definition?.description || ''}
+            name={this.displayName(data)}
+            urn={data.urn}
+            url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
+            logoComponent={<PreviewPropIcon />}
+            entityType={EntityType.StructuredProperty}
+            typeIcon={this.icon(14, IconStyleType.ACCENT)}
+            previewType={previewType}
+        />
+    );
+
+    renderSearch = (result: SearchResult) => {
+        return this.renderPreview(PreviewType.SEARCH, result.entity as StructuredProperty);
+    };
+
+    displayName = (data: StructuredProperty) => {
+        return data.definition?.displayName || data.definition?.qualifiedName || data.urn;
+    };
+
+    getGenericEntityProperties = (entity: StructuredProperty) => {
+        return getDataForEntityType({ data: entity, entityType: this.type, getOverrideProperties: (data) => data });
+    };
+
+    supportedCapabilities = () => {
+        return new Set([]);
+    };
+}
diff --git a/datahub-web-react/src/app/search/SearchPage.tsx b/datahub-web-react/src/app/search/SearchPage.tsx
index fa0643742e376b..aa83e739f2d778 100644
--- a/datahub-web-react/src/app/search/SearchPage.tsx
+++ b/datahub-web-react/src/app/search/SearchPage.tsx
@@ -59,7 +59,7 @@ export const SearchPage = () => {
                 orFilters,
                 viewUrn,
                 sortInput,
-                searchFlags: { getSuggestions: true },
+                searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
             },
         },
         fetchPolicy: 'cache-and-network',
diff --git a/datahub-web-react/src/app/search/filters/ActiveFilter.tsx b/datahub-web-react/src/app/search/filters/ActiveFilter.tsx
index 29789f872e51d3..5882641cd2c9ca 100644
--- a/datahub-web-react/src/app/search/filters/ActiveFilter.tsx
+++ b/datahub-web-react/src/app/search/filters/ActiveFilter.tsx
@@ -49,9 +49,18 @@ function ActiveFilter({
     const filterEntity = getFilterEntity(filterFacet.field, filterValue, availableFilters);
     const filterLabelOverride = useGetBrowseV2LabelOverride(filterFacet.field, filterValue, entityRegistry);
     const filterRenderer = useFilterRendererRegistry();
+    const facetEntity = availableFilters?.find((f) => f.field === filterFacet.field)?.entity;
 
     const { icon, label } = !filterRenderer.hasRenderer(filterFacet.field)
-        ? getFilterIconAndLabel(filterFacet.field, filterValue, entityRegistry, filterEntity, 12, filterLabelOverride)
+        ? getFilterIconAndLabel(
+              filterFacet.field,
+              filterValue,
+              entityRegistry,
+              filterEntity,
+              12,
+              filterLabelOverride,
+              facetEntity,
+          )
         : {
               icon: filterRenderer.getIcon(filterFacet.field),
               label: filterRenderer.getValueLabel(filterFacet.field, filterValue),
diff --git a/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts b/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts
index 38f8007985451e..87c85a4e39dc00 100644
--- a/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts
+++ b/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts
@@ -91,7 +91,7 @@ export function getDisplayedFilterOptions(
                 .filter(
                     (option) => option.value.includes(FILTER_DELIMITER) && option.value.includes(filterOption.value),
                 )
-                .map((option) => ({ field: ENTITY_SUB_TYPE_FILTER_NAME, ...option }))
+                .map((option) => ({ field: ENTITY_SUB_TYPE_FILTER_NAME, ...option } as FilterOptionType))
                 .filter((o) => filterNestedOptions(o, entityRegistry, searchQuery));
             return mapFilterOption({
                 filterOption,
diff --git a/datahub-web-react/src/app/search/filters/FilterOption.tsx b/datahub-web-react/src/app/search/filters/FilterOption.tsx
index 50b78c7f0685c9..15851eb915e739 100644
--- a/datahub-web-react/src/app/search/filters/FilterOption.tsx
+++ b/datahub-web-react/src/app/search/filters/FilterOption.tsx
@@ -123,9 +123,10 @@ export default function FilterOption({
     addPadding,
 }: Props) {
     const [areChildrenVisible, setAreChildrenVisible] = useState(true);
-    const { field, value, count, entity } = filterOption;
+    const { field, value, count, entity, displayName } = filterOption;
     const entityRegistry = useEntityRegistry();
     const { icon, label } = getFilterIconAndLabel(field, value, entityRegistry, entity || null, 14);
+    const finalLabel = displayName || label;
     const shouldShowIcon = (field === PLATFORM_FILTER_NAME || field === CONTAINER_FILTER_NAME) && icon !== null;
     const shouldShowTagColor = field === TAGS_FILTER_NAME && entity?.type === EntityType.Tag;
     const isSubTypeFilter = field === TYPE_NAMES_FILTER_NAME;
@@ -156,7 +157,7 @@ export default function FilterOption({
                         nestedOptions?.map((o) => o.value),
                     )}
                     onClick={updateFilterValues}
-                    data-testid={`filter-option-${label}`}
+                    data-testid={`filter-option-${finalLabel}`}
                 >
                     {parentEntities.length > 0 && (
                         <ParentWrapper>
@@ -170,8 +171,8 @@ export default function FilterOption({
                         )}
                         {(shouldShowIcon || shouldShowTagColor) && <IconSpacer />}
                         <LabelCountWrapper>
-                            <Label ellipsis={{ tooltip: label }} style={{ maxWidth: 150 }}>
-                                {isSubTypeFilter ? capitalizeFirstLetterOnly(label as string) : label}
+                            <Label ellipsis={{ tooltip: finalLabel }} style={{ maxWidth: 150 }}>
+                                {isSubTypeFilter ? capitalizeFirstLetterOnly(finalLabel as string) : finalLabel}
                             </Label>
                             <CountText>{countText}</CountText>
                             {nestedOptions && nestedOptions.length > 0 && (
diff --git a/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx b/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx
index 5012f8c645d17f..048b6627ab45e2 100644
--- a/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx
+++ b/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx
@@ -1,14 +1,13 @@
 import { RightOutlined } from '@ant-design/icons';
 import { Dropdown } from 'antd';
-import styled from 'styled-components';
 import React, { useRef } from 'react';
+import styled from 'styled-components';
 import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
-import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
 import OptionsDropdownMenu from './OptionsDropdownMenu';
-import useSearchFilterDropdown from './useSearchFilterDropdown';
 import { IconWrapper } from './SearchFilterView';
-import { getFilterDropdownIcon, useElementDimensions } from './utils';
 import { MoreFilterOptionLabel } from './styledComponents';
+import useSearchFilterDropdown from './useSearchFilterDropdown';
+import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from './utils';
 
 const IconNameWrapper = styled.span`
     display: flex;
@@ -40,6 +39,7 @@ export default function MoreFilterOption({ filter, activeFilters, onChangeFilter
         onChangeFilters,
     });
     const filterIcon = getFilterDropdownIcon(filter.field);
+    const displayName = useFilterDisplayName(filter);
 
     return (
         <Dropdown
@@ -55,7 +55,7 @@ export default function MoreFilterOption({ filter, activeFilters, onChangeFilter
                     searchQuery={searchQuery}
                     updateSearchQuery={updateSearchQuery}
                     isLoading={areFiltersLoading}
-                    searchPlaceholder={filter.displayName || ''}
+                    searchPlaceholder={displayName || ''}
                 />
             )}
         >
@@ -64,11 +64,11 @@ export default function MoreFilterOption({ filter, activeFilters, onChangeFilter
                 onClick={() => updateIsMenuOpen(!isMenuOpen)}
                 isActive={!!numActiveFilters}
                 isOpen={isMenuOpen}
-                data-testid={`more-filter-${capitalizeFirstLetterOnly(filter.displayName)}`}
+                data-testid={`more-filter-${displayName?.replace(/\s/g, '-')}`}
             >
                 <IconNameWrapper>
                     {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
-                    {capitalizeFirstLetterOnly(filter.displayName)} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
+                    {displayName} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
                 </IconNameWrapper>
                 <RightOutlined style={{ fontSize: '12px', height: '12px' }} />
             </MoreFilterOptionLabel>
diff --git a/datahub-web-react/src/app/search/filters/SearchFilter.tsx b/datahub-web-react/src/app/search/filters/SearchFilter.tsx
index 26b3a0d5ff5c23..4e6d7d63a868e8 100644
--- a/datahub-web-react/src/app/search/filters/SearchFilter.tsx
+++ b/datahub-web-react/src/app/search/filters/SearchFilter.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FacetFilterInput, FacetMetadata } from '../../../types.generated';
 import useSearchFilterDropdown from './useSearchFilterDropdown';
-import { getFilterDropdownIcon } from './utils';
+import { getFilterDropdownIcon, useFilterDisplayName } from './utils';
 import SearchFilterView from './SearchFilterView';
 import { ENTITY_FILTER_NAME } from '../utils/constants';
 import EntityTypeFilter from './EntityTypeFilter/EntityTypeFilter';
@@ -28,6 +28,7 @@ export default function SearchFilter({ filter, activeFilters, onChangeFilters }:
         onChangeFilters,
     });
     const filterIcon = getFilterDropdownIcon(filter.field);
+    const displayName = useFilterDisplayName(filter);
 
     if (filter.field === ENTITY_FILTER_NAME) {
         return <EntityTypeFilter filter={filter} activeFilters={activeFilters} onChangeFilters={onChangeFilters} />;
@@ -39,7 +40,7 @@ export default function SearchFilter({ filter, activeFilters, onChangeFilters }:
             isMenuOpen={isMenuOpen}
             numActiveFilters={numActiveFilters}
             filterIcon={filterIcon}
-            displayName={filter.displayName || ''}
+            displayName={displayName || ''}
             searchQuery={searchQuery}
             loading={areFiltersLoading}
             updateIsMenuOpen={updateIsMenuOpen}
diff --git a/datahub-web-react/src/app/search/filters/SearchFilterView.tsx b/datahub-web-react/src/app/search/filters/SearchFilterView.tsx
index ee448e6e1acf26..09ce32d5a3328a 100644
--- a/datahub-web-react/src/app/search/filters/SearchFilterView.tsx
+++ b/datahub-web-react/src/app/search/filters/SearchFilterView.tsx
@@ -61,10 +61,10 @@ export default function SearchFilterView({
             <SearchFilterLabel
                 onClick={() => updateIsMenuOpen(!isMenuOpen)}
                 isActive={!!numActiveFilters}
-                data-testid={`filter-dropdown-${capitalizeFirstLetterOnly(displayName)}`}
+                data-testid={`filter-dropdown-${displayName?.replace(/\s/g, '-')}`}
             >
                 {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
-                {capitalizeFirstLetterOnly(displayName)} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
+                {displayName} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
                 <CaretDownFilled style={{ fontSize: '12px', height: '12px' }} />
             </SearchFilterLabel>
         </Dropdown>
diff --git a/datahub-web-react/src/app/search/filters/mapFilterOption.tsx b/datahub-web-react/src/app/search/filters/mapFilterOption.tsx
index 4f2b7bf21051c2..6abc3505fe3a47 100644
--- a/datahub-web-react/src/app/search/filters/mapFilterOption.tsx
+++ b/datahub-web-react/src/app/search/filters/mapFilterOption.tsx
@@ -45,7 +45,7 @@ export function mapFilterOption({
             />
         ),
         style: { padding: 0 },
-        displayName: displayName as string,
+        displayName: filterOption.displayName || (displayName as string),
         nestedOptions,
     };
 }
diff --git a/datahub-web-react/src/app/search/filters/types.ts b/datahub-web-react/src/app/search/filters/types.ts
index 3f4a705e827c41..6704c7fa01a48e 100644
--- a/datahub-web-react/src/app/search/filters/types.ts
+++ b/datahub-web-react/src/app/search/filters/types.ts
@@ -5,4 +5,5 @@ export interface FilterOptionType {
     value: string;
     count?: number;
     entity?: Entity | null;
+    displayName?: string;
 }
diff --git a/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx b/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx
index 8467449ab6029f..193e6f6c4887eb 100644
--- a/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx
+++ b/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx
@@ -107,7 +107,13 @@ export default function useSearchFilterDropdown({ filter, activeFilters, onChang
     );
     // filter out any aggregations with a count of 0 unless it's already selected and in activeFilters
     const finalAggregations = filterEmptyAggregations(combinedAggregations, activeFilters);
-    const filterOptions = getFilterOptions(filter.field, finalAggregations, selectedFilterOptions, autoCompleteResults)
+    const filterOptions = getFilterOptions(
+        filter.field,
+        finalAggregations,
+        selectedFilterOptions,
+        autoCompleteResults,
+        filter.entity,
+    )
         .map((filterOption) =>
             mapFilterOption({ filterOption, entityRegistry, selectedFilterOptions, setSelectedFilterOptions }),
         )
diff --git a/datahub-web-react/src/app/search/filters/utils.tsx b/datahub-web-react/src/app/search/filters/utils.tsx
index bd747777d11175..df1181fa7c30cd 100644
--- a/datahub-web-react/src/app/search/filters/utils.tsx
+++ b/datahub-web-react/src/app/search/filters/utils.tsx
@@ -1,4 +1,7 @@
+import moment from 'moment-timezone';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
 import Icon from '@ant-design/icons/lib/components/Icon';
+import TableIcon from '@src/images/table-icon.svg?react';
 import {
     BookOutlined,
     DatabaseOutlined,
@@ -21,6 +24,7 @@ import {
     FacetMetadata,
     GlossaryTerm,
     Container,
+    StructuredPropertyEntity,
 } from '../../../types.generated';
 import { IconStyleType } from '../../entity/Entity';
 import {
@@ -34,6 +38,7 @@ import {
     LEGACY_ENTITY_FILTER_NAME,
     OWNERS_FILTER_NAME,
     PLATFORM_FILTER_NAME,
+    STRUCTURED_PROPERTIES_FILTER_NAME,
     TAGS_FILTER_NAME,
     TYPE_NAMES_FILTER_NAME,
     UNIT_SEPARATOR,
@@ -45,6 +50,8 @@ import { GetAutoCompleteMultipleResultsQuery } from '../../../graphql/search.gen
 import { FACETS_TO_ENTITY_TYPES } from './constants';
 import { FilterOptionType } from './types';
 import { capitalizeFirstLetterOnly } from '../../shared/textUtil';
+import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText';
+import { DATE_TYPE_URN } from '@src/app/shared/constants';
 
 // either adds or removes selectedFilterValues to/from activeFilters for a given filterField
 export function getNewFilters(filterField: string, activeFilters: FacetFilterInput[], selectedFilterValues: string[]) {
@@ -164,6 +171,7 @@ export function getFilterIconAndLabel(
     filterEntity: Entity | null,
     size?: number,
     filterLabelOverride?: string | null,
+    facetEntity?: Entity | null,
 ) {
     let icon: React.ReactNode = null;
     let label: React.ReactNode = null;
@@ -209,6 +217,9 @@ export function getFilterIconAndLabel(
 
         icon = newIcon;
         label = newLabel;
+    } else if (filterField.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
+        label = getStructuredPropFilterDisplayName(filterField, filterValue, facetEntity);
+        icon = <Icon component={TableIcon} />;
     } else {
         label = filterValue;
     }
@@ -268,6 +279,10 @@ export function sortFacets(facetA: FacetMetadata, facetB: FacetMetadata, sortedF
 }
 
 export function getFilterDropdownIcon(field: string) {
+    if (field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
+        return <Icon component={TableIcon} />;
+    }
+
     switch (field) {
         case PLATFORM_FILTER_NAME:
             return <DatabaseOutlined />;
@@ -296,8 +311,13 @@ export function getFilterOptions(
     aggregations: AggregationMetadata[],
     selectedFilterOptions: FilterOptionType[],
     autoCompleteResults?: GetAutoCompleteMultipleResultsQuery,
+    filterEntity?: Entity | null,
 ) {
-    const aggregationFilterOptions = aggregations.map((agg) => ({ field: filterField, ...agg }));
+    const aggregationFilterOptions = aggregations.map((agg) => ({
+        field: filterField,
+        displayName: getStructuredPropFilterDisplayName(filterField, agg.value, filterEntity),
+        ...agg,
+    }));
 
     const searchResults = autoCompleteResults?.autoCompleteForMultiple?.suggestions.find((suggestion) =>
         FACETS_TO_ENTITY_TYPES[filterField]?.includes(suggestion.type),
@@ -384,3 +404,36 @@ export function useElementDimensions(ref) {
 
     return dimensions;
 }
+
+export function getStructuredPropFilterDisplayName(field: string, value: string, entity?: Entity | null) {
+    const isStructuredPropertyValue = field.startsWith('structuredProperties.');
+    if (!isStructuredPropertyValue) return undefined;
+
+    // check for structured prop entity values
+    if (value.startsWith('urn:li:')) {
+        // this value is an urn, handle entity display names elsewhere
+        return undefined;
+    }
+
+    // check for structured prop date values
+    if (entity && (entity as StructuredPropertyEntity).definition?.valueType?.urn === DATE_TYPE_URN) {
+        return moment(parseInt(value, 10)).tz('GMT').format('MM/DD/YYYY').toString();
+    }
+
+    // check for structured prop number values
+    if (!Number.isNaN(parseFloat(value))) {
+        return parseFloat(value).toString();
+    }
+
+    return removeMarkdown(value);
+}
+
+export function useFilterDisplayName(filter: FacetMetadata, predicateDisplayName?: string) {
+    const entityRegistry = useEntityRegistry();
+
+    if (filter.entity) {
+        return entityRegistry.getDisplayName(filter.entity.type, filter.entity);
+    }
+
+    return predicateDisplayName || filter.displayName || filter.field;
+}
diff --git a/datahub-web-react/src/app/search/utils/constants.ts b/datahub-web-react/src/app/search/utils/constants.ts
index a791bceec44d72..7aa416e12c954f 100644
--- a/datahub-web-react/src/app/search/utils/constants.ts
+++ b/datahub-web-react/src/app/search/utils/constants.ts
@@ -25,6 +25,7 @@ export const REMOVED_FILTER_NAME = 'removed';
 export const ORIGIN_FILTER_NAME = 'origin';
 export const DEGREE_FILTER_NAME = 'degree';
 export const BROWSE_PATH_V2_FILTER_NAME = 'browsePathV2';
+export const STRUCTURED_PROPERTIES_FILTER_NAME = 'structuredProperties.';
 export const ENTITY_TYPES_FILTER_NAME = 'entityTypes';
 export const IS_HIDDEN_PROPERTY_FILTER_NAME = 'isHidden';
 export const SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME = 'showInColumnsTable';
diff --git a/datahub-web-react/src/app/shared/constants.ts b/datahub-web-react/src/app/shared/constants.ts
index 1cd9077ab8cdf8..5ccc6e5698faa2 100644
--- a/datahub-web-react/src/app/shared/constants.ts
+++ b/datahub-web-react/src/app/shared/constants.ts
@@ -1,5 +1,8 @@
 export const ENTER_KEY_CODE = 13;
 
+export const DATE_TYPE_URN = 'urn:li:dataType:datahub.date';
+export const TYPE_ICON_CLASS_NAME = 'typeIcon';
+
 export enum ErrorCodes {
     BadRequest = 400,
     Unauthorized = 401,
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 788c68349b4268..3059c6ceaa526a 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -1238,7 +1238,7 @@ fragment entityDisplayNameFields on Entity {
         }
     }
     ... on DataPlatformInstance {
-        instanceId
+    instanceId
     }
     ... on StructuredPropertyEntity {
         definition {
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index e6938a3d4fb30b..ce0fde27f4c425 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -945,6 +945,18 @@ fragment searchResultFields on Entity {
 fragment facetFields on FacetMetadata {
     field
     displayName
+    entity {
+        urn
+        type
+        ...entityDisplayNameFields
+        ... on StructuredPropertyEntity {
+            definition {
+                valueType {
+                    urn
+                }
+            }
+        }
+    }
     aggregations {
         value
         count
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
index 60ca7649331a00..55a1d690afd49e 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/AggregationQueryBuilder.java
@@ -5,11 +5,15 @@
 import static com.linkedin.metadata.search.utils.ESUtils.toParentField;
 import static com.linkedin.metadata.utils.SearchUtil.*;
 
+import com.linkedin.common.urn.UrnUtils;
+import com.linkedin.data.schema.PathSpec;
 import com.linkedin.data.template.LongMap;
+import com.linkedin.data.template.StringArray;
 import com.linkedin.metadata.aspect.AspectRetriever;
 import com.linkedin.metadata.config.search.SearchConfiguration;
 import com.linkedin.metadata.models.EntitySpec;
 import com.linkedin.metadata.models.annotation.SearchableAnnotation;
+import com.linkedin.metadata.query.filter.Condition;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
 import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
 import com.linkedin.metadata.query.filter.Criterion;
@@ -22,10 +26,13 @@
 import com.linkedin.util.Pair;
 import io.datahubproject.metadata.context.OperationContext;
 import io.opentelemetry.extension.annotations.WithSpan;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -48,6 +55,7 @@
 @Slf4j
 public class AggregationQueryBuilder {
   private static final String URN_FILTER = "urn";
+  private static final String STRUCTURED_PROPERTIES_PREFIX = "structuredProperties.";
   private final SearchConfiguration configs;
   private final Set<String> defaultFacetFields;
   private final Set<String> allFacetFields;
@@ -80,12 +88,13 @@ public List<AggregationBuilder> getAggregations(@Nonnull OperationContext opCont
    */
   public List<AggregationBuilder> getAggregations(
       @Nonnull OperationContext opContext, @Nullable List<String> facets) {
-    final Set<String> facetsToAggregate;
+    final Set<String> facetsToAggregate = new HashSet<>();
+    if (Boolean.TRUE.equals(
+        opContext.getSearchContext().getSearchFlags().isIncludeDefaultFacets())) {
+      facetsToAggregate.addAll(defaultFacetFields);
+    }
     if (facets != null) {
-      facetsToAggregate =
-          facets.stream().filter(this::isValidAggregate).collect(Collectors.toSet());
-    } else {
-      facetsToAggregate = defaultFacetFields;
+      facets.stream().filter(this::isValidAggregate).forEach(facetsToAggregate::add);
     }
     return facetsToAggregate.stream()
         .map(f -> facetToAggregationBuilder(opContext, f))
@@ -247,7 +256,7 @@ List<AggregationMetadata> extractAggregationMetadata(
     return addFiltersToAggregationMetadata(aggregationMetadataList, filter, aspectRetriever);
   }
 
-  private void processTermAggregations(
+  public void processTermAggregations(
       final Map.Entry<String, Aggregation> entry,
       final List<AggregationMetadata> aggregationMetadataList) {
     final Map<String, Long> oneTermAggResult =
@@ -264,6 +273,7 @@ private void processTermAggregations(
             .setFilterValues(
                 new FilterValueArray(
                     SearchUtil.convertToFilters(oneTermAggResult, Collections.emptySet())));
+    updateAggregationEntity(aggregationMetadata);
     aggregationMetadataList.add(aggregationMetadata);
   }
 
@@ -300,7 +310,15 @@ private static void recurseTermsAgg(
 
   private static void processTermBucket(
       Terms.Bucket bucket, Map<String, Long> aggResult, boolean includeZeroes) {
-    String key = bucket.getKeyAsString();
+    final String key = bucket.getKeyAsString();
+    String finalKey = key;
+    try {
+      // if the value is a date string, convert to milliseconds since epoch
+      OffsetDateTime time = OffsetDateTime.parse(key);
+      finalKey = String.valueOf(time.toEpochSecond() * 1000);
+    } catch (DateTimeParseException e) {
+      // do nothing, this is expected if the value is not a date
+    }
     // Gets filtered sub aggregation doc count if exist
     Map<String, Long> subAggs = recursivelyAddNestedSubAggs(bucket.getAggregations());
     subAggs.forEach(
@@ -309,7 +327,7 @@ private static void processTermBucket(
                 String.format("%s%s%s", key, AGGREGATION_SEPARATOR_CHAR, entryKey), entryValue));
     long docCount = bucket.getDocCount();
     if (includeZeroes || docCount > 0) {
-      aggResult.put(key, docCount);
+      aggResult.put(finalKey, docCount);
     }
   }
 
@@ -474,11 +492,24 @@ private AggregationMetadata buildAggregationMetadata(
       @Nonnull final String displayName,
       @Nonnull final LongMap aggValues,
       @Nonnull final FilterValueArray filterValues) {
-    return new AggregationMetadata()
-        .setName(facetField)
-        .setDisplayName(displayName)
-        .setAggregations(aggValues)
-        .setFilterValues(filterValues);
+    AggregationMetadata aggregationMetadata =
+        new AggregationMetadata()
+            .setName(facetField)
+            .setDisplayName(displayName)
+            .setAggregations(aggValues)
+            .setFilterValues(filterValues);
+    updateAggregationEntity(aggregationMetadata);
+    return aggregationMetadata;
+  }
+
+  public void updateAggregationEntity(@Nonnull final AggregationMetadata aggregationMetadata) {
+    if (aggregationMetadata.getName().startsWith(STRUCTURED_PROPERTIES_PREFIX)) {
+      aggregationMetadata.setEntity(
+          UrnUtils.getUrn(
+              String.format(
+                  "urn:li:structuredProperty:%s",
+                  aggregationMetadata.getName().replaceFirst(STRUCTURED_PROPERTIES_PREFIX, ""))));
+    }
   }
 
   private List<Pair<String, Pair<String, String>>> getFacetFieldDisplayNameFromAnnotation(
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
index 3969223981ec3f..08873bdb4a41b4 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
@@ -3,9 +3,7 @@
 import static com.linkedin.metadata.Constants.DATA_TYPE_URN_PREFIX;
 import static com.linkedin.metadata.Constants.STRUCTURED_PROPERTY_DEFINITION_ASPECT_NAME;
 import static com.linkedin.metadata.utils.SearchUtil.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anySet;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -53,6 +51,7 @@ public class AggregationQueryBuilderTest {
 
   private static AspectRetriever aspectRetriever;
   private static AspectRetriever aspectRetrieverV1;
+  private static String DEFAULT_FILTER = "_index";
 
   @BeforeClass
   public void setup() throws RemoteInvocationException, URISyntaxException {
@@ -267,16 +266,19 @@ public void testGetSpecificAggregationsHasFields() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(),
             ImmutableList.of("test1", "test2", "hasTest1"));
-    Assert.assertEquals(aggs.size(), 3);
+    Assert.assertEquals(aggs.size(), 5);
     Set<String> facets = aggs.stream().map(AggregationBuilder::getName).collect(Collectors.toSet());
-    Assert.assertEquals(ImmutableSet.of("test1", "test2", "hasTest1"), facets);
+    Assert.assertEquals(
+        ImmutableSet.of("test1", "test2", "hasTest1", "_entityType", "_entityType␞typeNames"),
+        facets);
 
     // Case 2: Ask for fields that should NOT exist.
     aggs =
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(),
             ImmutableList.of("hasTest2"));
-    Assert.assertEquals(aggs.size(), 0);
+    Assert.assertEquals(
+        aggs.size(), 2); // default has two fields already, hasTest2 will not be in there
   }
 
   @Test
@@ -292,7 +294,7 @@ public void testAggregateOverStructuredProperty() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetriever),
             List.of("structuredProperties.ab.fgh.ten"));
-    Assert.assertEquals(aggs.size(), 1);
+    Assert.assertEquals(aggs.size(), 3);
     AggregationBuilder aggBuilder = aggs.get(0);
     Assert.assertTrue(aggBuilder instanceof TermsAggregationBuilder);
     TermsAggregationBuilder agg = (TermsAggregationBuilder) aggBuilder;
@@ -307,12 +309,18 @@ public void testAggregateOverStructuredProperty() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetriever),
             List.of("structuredProperties.ab.fgh.ten", "structuredProperties.hello"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(
+        aggs.size(),
+        4); // has two default filters (_entityType, _entityType␞typeNames) both get mapped to
+    // _index
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
             .collect(Collectors.toSet()),
-        Set.of("structuredProperties.ab_fgh_ten.keyword", "structuredProperties.hello.keyword"));
+        Set.of(
+            "structuredProperties.ab_fgh_ten.keyword",
+            "structuredProperties.hello.keyword",
+            DEFAULT_FILTER));
   }
 
   @Test
@@ -328,16 +336,12 @@ public void testAggregateOverStructuredPropertyNamespaced() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetriever),
             List.of("structuredProperties.under.scores.and.dots_make_a_mess"));
-    Assert.assertEquals(aggs.size(), 1);
-    AggregationBuilder aggBuilder = aggs.get(0);
-    Assert.assertTrue(aggBuilder instanceof TermsAggregationBuilder);
-    TermsAggregationBuilder agg = (TermsAggregationBuilder) aggBuilder;
-    // Check that field name is sanitized to correct field name
+    Assert.assertEquals(aggs.size(), 3);
     Assert.assertEquals(
-        agg.field(),
-        "structuredProperties.under_scores_and_dots_make_a_mess.keyword",
-        "Terms aggregate must be on a keyword or subfield keyword");
-
+        aggs.stream()
+            .map(aggr -> ((TermsAggregationBuilder) aggr).field())
+            .collect(Collectors.toSet()),
+        Set.of("structuredProperties.under_scores_and_dots_make_a_mess.keyword", DEFAULT_FILTER));
     // Two structured properties
     aggs =
         builder.getAggregations(
@@ -345,14 +349,15 @@ public void testAggregateOverStructuredPropertyNamespaced() {
             List.of(
                 "structuredProperties.under.scores.and.dots_make_a_mess",
                 "structuredProperties.hello"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(aggs.size(), 4);
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
             .collect(Collectors.toSet()),
         Set.of(
             "structuredProperties.under_scores_and_dots_make_a_mess.keyword",
-            "structuredProperties.hello.keyword"));
+            "structuredProperties.hello.keyword",
+            DEFAULT_FILTER));
   }
 
   @Test
@@ -368,7 +373,7 @@ public void testAggregateOverStructuredPropertyV1() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetrieverV1),
             List.of("structuredProperties.ab.fgh.ten"));
-    Assert.assertEquals(aggs.size(), 1);
+    Assert.assertEquals(aggs.size(), 3);
     AggregationBuilder aggBuilder = aggs.get(0);
     Assert.assertTrue(aggBuilder instanceof TermsAggregationBuilder);
     TermsAggregationBuilder agg = (TermsAggregationBuilder) aggBuilder;
@@ -385,14 +390,18 @@ public void testAggregateOverStructuredPropertyV1() {
             List.of(
                 "structuredProperties.ab.fgh.ten",
                 "structuredProperties._versioned.hello.00000000000001.string"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(
+        aggs.size(),
+        4); // has two default filters (_entityType, _entityType␞typeNames) both get mapped to
+    // _index
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
             .collect(Collectors.toSet()),
         Set.of(
             "structuredProperties._versioned.ab_fgh_ten.00000000000001.string.keyword",
-            "structuredProperties._versioned.hello.00000000000001.string.keyword"));
+            "structuredProperties._versioned.hello.00000000000001.string.keyword",
+            DEFAULT_FILTER));
   }
 
   @Test
@@ -408,15 +417,14 @@ public void testAggregateOverStructuredPropertyNamespacedV1() {
         builder.getAggregations(
             TestOperationContexts.systemContextNoSearchAuthorization(aspectRetrieverV1),
             List.of("structuredProperties.under.scores.and.dots_make_a_mess"));
-    Assert.assertEquals(aggs.size(), 1);
-    AggregationBuilder aggBuilder = aggs.get(0);
-    Assert.assertTrue(aggBuilder instanceof TermsAggregationBuilder);
-    TermsAggregationBuilder agg = (TermsAggregationBuilder) aggBuilder;
-    // Check that field name is sanitized to correct field name
+    Assert.assertEquals(aggs.size(), 3);
     Assert.assertEquals(
-        agg.field(),
-        "structuredProperties._versioned.under_scores_and_dots_make_a_mess.00000000000001.string.keyword",
-        "Terms aggregation must be on a keyword field or subfield.");
+        aggs.stream()
+            .map(aggr -> ((TermsAggregationBuilder) aggr).field())
+            .collect(Collectors.toSet()),
+        Set.of(
+            "structuredProperties._versioned.under_scores_and_dots_make_a_mess.00000000000001.string.keyword",
+            DEFAULT_FILTER));
 
     // Two structured properties
     aggs =
@@ -425,14 +433,15 @@ public void testAggregateOverStructuredPropertyNamespacedV1() {
             List.of(
                 "structuredProperties.under.scores.and.dots_make_a_mess",
                 "structuredProperties._versioned.hello.00000000000001.string"));
-    Assert.assertEquals(aggs.size(), 2);
+    Assert.assertEquals(aggs.size(), 4);
     Assert.assertEquals(
         aggs.stream()
             .map(aggr -> ((TermsAggregationBuilder) aggr).field())
             .collect(Collectors.toSet()),
         Set.of(
             "structuredProperties._versioned.under_scores_and_dots_make_a_mess.00000000000001.string.keyword",
-            "structuredProperties._versioned.hello.00000000000001.string.keyword"));
+            "structuredProperties._versioned.hello.00000000000001.string.keyword",
+            DEFAULT_FILTER));
   }
 
   @Test
@@ -489,7 +498,7 @@ public void testAggregateOverFieldsAndStructProp() {
                 "hasTest1",
                 "structuredProperties.ab.fgh.ten",
                 "structuredProperties.hello"));
-    Assert.assertEquals(aggs.size(), 5);
+    Assert.assertEquals(aggs.size(), 7);
     Set<String> facets =
         aggs.stream()
             .map(aggB -> ((TermsAggregationBuilder) aggB).field())
@@ -501,7 +510,8 @@ public void testAggregateOverFieldsAndStructProp() {
             "test2.keyword",
             "hasTest1",
             "structuredProperties.ab_fgh_ten.keyword",
-            "structuredProperties.hello.keyword"));
+            "structuredProperties.hello.keyword",
+            DEFAULT_FILTER));
   }
 
   @Test
@@ -558,7 +568,10 @@ public void testAggregateOverFieldsAndStructPropV1() {
                 "hasTest1",
                 "structuredProperties.ab.fgh.ten",
                 "structuredProperties.hello"));
-    Assert.assertEquals(aggs.size(), 5);
+    Assert.assertEquals(
+        aggs.size(),
+        7); // has two default filters (_entityType, _entityType␞typeNames) both get mapped to
+    // _index
     Set<String> facets =
         aggs.stream()
             .map(aggB -> ((TermsAggregationBuilder) aggB).field())
@@ -570,7 +583,8 @@ public void testAggregateOverFieldsAndStructPropV1() {
             "test2.keyword",
             "hasTest1",
             "structuredProperties._versioned.ab_fgh_ten.00000000000001.string.keyword",
-            "structuredProperties._versioned.hello.00000000000001.string.keyword"));
+            "structuredProperties._versioned.hello.00000000000001.string.keyword",
+            DEFAULT_FILTER));
   }
 
   @Test
@@ -613,6 +627,39 @@ public void testMissingAggregation() {
                             MISSING_SPECIAL_TYPE + AGGREGATION_SPECIAL_TYPE_DELIMITER + "test")));
   }
 
+  @Test
+  public void testUpdateAggregationEntityWithStructuredProp() {
+    final AggregationMetadata aggregationMetadata = new AggregationMetadata();
+    aggregationMetadata.setName("structuredProperties.test_me.one");
+
+    SearchConfiguration config = new SearchConfiguration();
+    config.setMaxTermBucketSize(25);
+
+    AggregationQueryBuilder builder =
+        new AggregationQueryBuilder(
+            config, ImmutableMap.of(mock(EntitySpec.class), ImmutableList.of()));
+
+    builder.updateAggregationEntity(aggregationMetadata);
+    Assert.assertEquals(
+        aggregationMetadata.getEntity(), UrnUtils.getUrn("urn:li:structuredProperty:test_me.one"));
+  }
+
+  @Test
+  public void testUpdateAggregationEntityWithRegularFilter() {
+    final AggregationMetadata aggregationMetadata = new AggregationMetadata();
+    aggregationMetadata.setName("domains");
+
+    SearchConfiguration config = new SearchConfiguration();
+    config.setMaxTermBucketSize(25);
+
+    AggregationQueryBuilder builder =
+        new AggregationQueryBuilder(
+            config, ImmutableMap.of(mock(EntitySpec.class), ImmutableList.of()));
+
+    builder.updateAggregationEntity(aggregationMetadata);
+    Assert.assertNull(aggregationMetadata.getEntity());
+  }
+
   @Test
   public void testAddFiltersToMetadataWithStructuredPropsNoResults() {
     final Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:test_me.one");
@@ -633,12 +680,12 @@ public void testAddFiltersToMetadataWithStructuredPropsNoResults() {
     AspectRetriever mockAspectRetriever = getMockAspectRetriever(propertyUrn);
 
     final List<AggregationMetadata> aggregationMetadataList = new ArrayList<>();
-    builder.addCriterionFiltersToAggregationMetadata(
+    builder.addFacetFiltersToAggregationMetadata(
         criterion, aggregationMetadataList, mockAspectRetriever);
 
     // ensure we add the correct structured prop aggregation here
     Assert.assertEquals(aggregationMetadataList.size(), 1);
-    //    Assert.assertEquals(aggregationMetadataList.get(0).getEntity(), propertyUrn);
+    Assert.assertEquals(aggregationMetadataList.get(0).getEntity(), propertyUrn);
     Assert.assertEquals(
         aggregationMetadataList.get(0).getName(), "structuredProperties.test_me.one");
     Assert.assertEquals(aggregationMetadataList.get(0).getAggregations().size(), 1);
@@ -651,6 +698,7 @@ public void testAddFiltersToMetadataWithStructuredPropsWithAggregations() {
 
     final AggregationMetadata aggregationMetadata = new AggregationMetadata();
     aggregationMetadata.setName("structuredProperties.test_me.one");
+    aggregationMetadata.setEntity(propertyUrn);
     FilterValue filterValue =
         new FilterValue().setValue("test123").setFiltered(false).setFacetCount(1);
     aggregationMetadata.setFilterValues(new FilterValueArray(filterValue));
@@ -675,10 +723,11 @@ public void testAddFiltersToMetadataWithStructuredPropsWithAggregations() {
 
     final List<AggregationMetadata> aggregationMetadataList = new ArrayList<>();
     aggregationMetadataList.add(aggregationMetadata);
-    builder.addCriterionFiltersToAggregationMetadata(
+    builder.addFacetFiltersToAggregationMetadata(
         criterion, aggregationMetadataList, mockAspectRetriever);
 
     Assert.assertEquals(aggregationMetadataList.size(), 1);
+    Assert.assertEquals(aggregationMetadataList.get(0).getEntity(), propertyUrn);
     Assert.assertEquals(
         aggregationMetadataList.get(0).getName(), "structuredProperties.test_me.one");
     Assert.assertEquals(aggregationMetadataList.get(0).getAggregations().size(), 1);
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 718a00d067ce5a..d59d296b87e9d8 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
@@ -298,7 +298,7 @@ public void testAggregationsInSearch() {
         String.format("_entityType%stextFieldOverride", AGGREGATION_SEPARATOR_CHAR);
     SearchRequest searchRequest =
         requestHandler.getSearchRequest(
-            operationContext.withSearchFlags(flags -> flags.setFulltext(true)),
+            operationContext.withSearchFlags(flags -> flags.setFulltext(true).setIncludeDefaultFacets(false)),
             "*",
             null,
             null,
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
index a3d2067ae5db25..a3a7a8cda58a8d 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
@@ -58,4 +58,10 @@ record SearchFlags {
    * invoke query rewrite chain for filters based on configured rewriters
    */
    rewriteQuery: optional boolean = true
+
+   /**
+    * Include default facets when getting facets to aggregate on in search requests.
+    * By default we include these, but custom aggregation requests don't need them.
+    */
+  includeDefaultFacets: optional boolean = true
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/AggregationMetadata.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/AggregationMetadata.pdl
index 0d3fa1e2a4ecf0..d3d25083ff4677 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/AggregationMetadata.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/AggregationMetadata.pdl
@@ -13,6 +13,11 @@ record AggregationMetadata {
      */
     displayName: optional string
 
+    /**
+     * Entity associated with this facet
+     */
+    entity: optional Urn
+
     /**
      * List of aggregations showing the number of documents falling into each bucket. e.g, for platform aggregation, the bucket can be hive, kafka, etc
      */
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.analytics.analytics.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.analytics.analytics.snapshot.json
index 061feafac1b9b9..92abc50abbc4df 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.analytics.analytics.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.analytics.analytics.snapshot.json
@@ -63,10 +63,10 @@
                           "DESCENDANTS_INCL" : "Represent the relation: URN field any nested children in addition to the given URN",
                           "END_WITH" : "Represent the relation: String field ends with value, e.g. name ends with Event",
                           "EQUAL" : "Represent the relation: field = value, e.g. platform = hdfs",
-                          "IEQUAL" : "Represent the relation: field = value and support case insensitive values, e.g. platform = hdfs",
                           "EXISTS" : "Represents the relation: field exists and is non-empty, e.g. owners is not null and != [] (empty)",
                           "GREATER_THAN" : "Represent the relation greater than, e.g. ownerCount > 5",
                           "GREATER_THAN_OR_EQUAL_TO" : "Represent the relation greater than or equal to, e.g. ownerCount >= 5",
+                          "IEQUAL" : "Represent the relation: field = value and support case insensitive values, e.g. platform = hdfs",
                           "IN" : "Represent the relation: String field is one of the array values to, e.g. name in [\"Profile\", \"Event\"]",
                           "IS_NULL" : "Represent the relation: field is null, e.g. platform is null",
                           "LESS_THAN" : "Represent the relation less than, e.g. ownerCount < 3",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
index e9e2778a479d32..827789130d8bbb 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.aspects.snapshot.json
@@ -169,10 +169,10 @@
                           "DESCENDANTS_INCL" : "Represent the relation: URN field any nested children in addition to the given URN",
                           "END_WITH" : "Represent the relation: String field ends with value, e.g. name ends with Event",
                           "EQUAL" : "Represent the relation: field = value, e.g. platform = hdfs",
-                          "IEQUAL" : "Represent the relation: field = value and support case insensitive values, e.g. platform = hdfs",
                           "EXISTS" : "Represents the relation: field exists and is non-empty, e.g. owners is not null and != [] (empty)",
                           "GREATER_THAN" : "Represent the relation greater than, e.g. ownerCount > 5",
                           "GREATER_THAN_OR_EQUAL_TO" : "Represent the relation greater than or equal to, e.g. ownerCount >= 5",
+                          "IEQUAL" : "Represent the relation: field = value and support case insensitive values, e.g. platform = hdfs",
                           "IN" : "Represent the relation: String field is one of the array values to, e.g. name in [\"Profile\", \"Event\"]",
                           "IS_NULL" : "Represent the relation: field is null, e.g. platform is null",
                           "LESS_THAN" : "Represent the relation less than, e.g. ownerCount < 3",
@@ -941,15 +941,18 @@
             "Searchable" : {
               "/actor" : {
                 "fieldName" : "tagAttributionActors",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/source" : {
                 "fieldName" : "tagAttributionSources",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/time" : {
                 "fieldName" : "tagAttributionDates",
-                "fieldType" : "DATETIME"
+                "fieldType" : "DATETIME",
+                "queryByDefault" : false
               }
             }
           } ]
@@ -1068,15 +1071,18 @@
       "Searchable" : {
         "/actor" : {
           "fieldName" : "termAttributionActors",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/source" : {
           "fieldName" : "termAttributionSources",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/time" : {
           "fieldName" : "termAttributionDates",
-          "fieldType" : "DATETIME"
+          "fieldType" : "DATETIME",
+          "queryByDefault" : false
         }
       }
     } ]
@@ -2570,7 +2576,7 @@
       "Searchable" : {
         "fieldName" : "managerLdap",
         "fieldType" : "URN",
-        "queryByDefault" : true
+        "queryByDefault" : false
       }
     }, {
       "name" : "departmentId",
@@ -2977,7 +2983,7 @@
               "type" : "com.linkedin.dataset.SchemaFieldPath",
               "doc" : "Flattened name of the field. Field is computed from jsonPath field.",
               "Searchable" : {
-                "boostScore" : 5.0,
+                "boostScore" : 1.0,
                 "fieldName" : "fieldPaths",
                 "fieldType" : "TEXT",
                 "queryByDefault" : "true"
@@ -3151,15 +3157,18 @@
               "Searchable" : {
                 "/tags/*/attribution/actor" : {
                   "fieldName" : "fieldTagAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/source" : {
                   "fieldName" : "fieldTagAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/time" : {
                   "fieldName" : "fieldTagAttributionDates",
-                  "fieldType" : "DATETIME"
+                  "fieldType" : "DATETIME",
+                  "queryByDefault" : false
                 },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
@@ -3181,15 +3190,18 @@
               "Searchable" : {
                 "/terms/*/attribution/actor" : {
                   "fieldName" : "fieldTermAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/source" : {
                   "fieldName" : "fieldTermAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/time" : {
                   "fieldName" : "fieldTermAttributionDates",
-                  "fieldType" : "DATETIME"
+                  "fieldType" : "DATETIME",
+                  "queryByDefault" : false
                 },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
@@ -3362,11 +3374,13 @@
               "Searchable" : {
                 "/tags/*/attribution/actor" : {
                   "fieldName" : "editedFieldTagAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/source" : {
                   "fieldName" : "editedFieldTagAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/time" : {
                   "fieldName" : "editedFieldTagAttributionDates",
@@ -3392,11 +3406,13 @@
               "Searchable" : {
                 "/terms/*/attribution/actor" : {
                   "fieldName" : "editedFieldTermAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/source" : {
                   "fieldName" : "editedFieldTermAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/time" : {
                   "fieldName" : "editedFieldTermAttributionDates",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index 959cb5381fd9b8..b549cef0af84b2 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -932,15 +932,18 @@
             "Searchable" : {
               "/actor" : {
                 "fieldName" : "tagAttributionActors",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/source" : {
                 "fieldName" : "tagAttributionSources",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/time" : {
                 "fieldName" : "tagAttributionDates",
-                "fieldType" : "DATETIME"
+                "fieldType" : "DATETIME",
+                "queryByDefault" : false
               }
             }
           } ]
@@ -1059,15 +1062,18 @@
       "Searchable" : {
         "/actor" : {
           "fieldName" : "termAttributionActors",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/source" : {
           "fieldName" : "termAttributionSources",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/time" : {
           "fieldName" : "termAttributionDates",
-          "fieldType" : "DATETIME"
+          "fieldType" : "DATETIME",
+          "queryByDefault" : false
         }
       }
     } ]
@@ -2783,7 +2789,7 @@
                     "Searchable" : {
                       "fieldName" : "managerLdap",
                       "fieldType" : "URN",
-                      "queryByDefault" : true
+                      "queryByDefault" : false
                     }
                   }, {
                     "name" : "departmentId",
@@ -3365,7 +3371,7 @@
                           "type" : "com.linkedin.dataset.SchemaFieldPath",
                           "doc" : "Flattened name of the field. Field is computed from jsonPath field.",
                           "Searchable" : {
-                            "boostScore" : 5.0,
+                            "boostScore" : 1.0,
                             "fieldName" : "fieldPaths",
                             "fieldType" : "TEXT",
                             "queryByDefault" : "true"
@@ -3539,15 +3545,18 @@
                           "Searchable" : {
                             "/tags/*/attribution/actor" : {
                               "fieldName" : "fieldTagAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/source" : {
                               "fieldName" : "fieldTagAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/time" : {
                               "fieldName" : "fieldTagAttributionDates",
-                              "fieldType" : "DATETIME"
+                              "fieldType" : "DATETIME",
+                              "queryByDefault" : false
                             },
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
@@ -3569,15 +3578,18 @@
                           "Searchable" : {
                             "/terms/*/attribution/actor" : {
                               "fieldName" : "fieldTermAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/source" : {
                               "fieldName" : "fieldTermAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/time" : {
                               "fieldName" : "fieldTermAttributionDates",
-                              "fieldType" : "DATETIME"
+                              "fieldType" : "DATETIME",
+                              "queryByDefault" : false
                             },
                             "/terms/*/urn" : {
                               "boostScore" : 0.5,
@@ -3750,11 +3762,13 @@
                           "Searchable" : {
                             "/tags/*/attribution/actor" : {
                               "fieldName" : "editedFieldTagAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/source" : {
                               "fieldName" : "editedFieldTagAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/time" : {
                               "fieldName" : "editedFieldTagAttributionDates",
@@ -3780,11 +3794,13 @@
                           "Searchable" : {
                             "/terms/*/attribution/actor" : {
                               "fieldName" : "editedFieldTermAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/source" : {
                               "fieldName" : "editedFieldTermAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/time" : {
                               "fieldName" : "editedFieldTermAttributionDates",
@@ -5204,9 +5220,9 @@
                     },
                     "Searchable" : {
                       "/*" : {
-                        "boostScore" : 2.0,
                         "fieldName" : "isRelatedTerms",
-                        "fieldType" : "URN"
+                        "fieldType" : "URN",
+                        "queryByDefault" : false
                       }
                     }
                   }, {
@@ -5225,9 +5241,9 @@
                     },
                     "Searchable" : {
                       "/*" : {
-                        "boostScore" : 2.0,
                         "fieldName" : "hasRelatedTerms",
-                        "fieldType" : "URN"
+                        "fieldType" : "URN",
+                        "queryByDefault" : false
                       }
                     }
                   }, {
@@ -6068,23 +6084,29 @@
       "doc" : "invoke query rewrite chain for filters based on configured rewriters",
       "default" : true,
       "optional" : true
+    }, {
+      "name" : "includeDefaultFacets",
+      "type" : "boolean",
+      "doc" : "Include default facets when getting facets to aggregate on in search requests.\nBy default we include these, but custom aggregation requests don't need them.",
+      "default" : true,
+      "optional" : true
     } ]
   }, {
     "type" : "enum",
     "name" : "Condition",
     "namespace" : "com.linkedin.metadata.query.filter",
     "doc" : "The matching condition in a filter criterion",
-    "symbols" : [ "CONTAIN", "END_WITH", "EQUAL","IEQUAL", "IS_NULL", "EXISTS", "GREATER_THAN", "GREATER_THAN_OR_EQUAL_TO", "IN", "LESS_THAN", "LESS_THAN_OR_EQUAL_TO", "START_WITH", "DESCENDANTS_INCL", "ANCESTORS_INCL", "RELATED_INCL" ],
+    "symbols" : [ "CONTAIN", "END_WITH", "EQUAL", "IEQUAL", "IS_NULL", "EXISTS", "GREATER_THAN", "GREATER_THAN_OR_EQUAL_TO", "IN", "LESS_THAN", "LESS_THAN_OR_EQUAL_TO", "START_WITH", "DESCENDANTS_INCL", "ANCESTORS_INCL", "RELATED_INCL" ],
     "symbolDocs" : {
       "ANCESTORS_INCL" : "Represent the relation: URN field matches any nested parent in addition to the given URN",
       "CONTAIN" : "Represent the relation: String field contains value, e.g. name contains Profile",
       "DESCENDANTS_INCL" : "Represent the relation: URN field any nested children in addition to the given URN",
       "END_WITH" : "Represent the relation: String field ends with value, e.g. name ends with Event",
       "EQUAL" : "Represent the relation: field = value, e.g. platform = hdfs",
-      "IEQUAL" : "Represent the relation: field = value and support case insensitive values, e.g. platform = hdfs",
       "EXISTS" : "Represents the relation: field exists and is non-empty, e.g. owners is not null and != [] (empty)",
       "GREATER_THAN" : "Represent the relation greater than, e.g. ownerCount > 5",
       "GREATER_THAN_OR_EQUAL_TO" : "Represent the relation greater than or equal to, e.g. ownerCount >= 5",
+      "IEQUAL" : "Represent the relation: field = value and support case insensitive values, e.g. platform = hdfs",
       "IN" : "Represent the relation: String field is one of the array values to, e.g. name in [\"Profile\", \"Event\"]",
       "IS_NULL" : "Represent the relation: field is null, e.g. platform is null",
       "LESS_THAN" : "Represent the relation less than, e.g. ownerCount < 3",
@@ -6314,6 +6336,11 @@
       "type" : "string",
       "doc" : "Name of the filter to be displayed in the UI",
       "optional" : true
+    }, {
+      "name" : "entity",
+      "type" : "com.linkedin.common.Urn",
+      "doc" : "Entity associated with this facet",
+      "optional" : true
     }, {
       "name" : "aggregations",
       "type" : {
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
index 3e0cd46aba0c05..c8be9d063eaea9 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.runs.snapshot.json
@@ -674,15 +674,18 @@
             "Searchable" : {
               "/actor" : {
                 "fieldName" : "tagAttributionActors",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/source" : {
                 "fieldName" : "tagAttributionSources",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/time" : {
                 "fieldName" : "tagAttributionDates",
-                "fieldType" : "DATETIME"
+                "fieldType" : "DATETIME",
+                "queryByDefault" : false
               }
             }
           } ]
@@ -801,15 +804,18 @@
       "Searchable" : {
         "/actor" : {
           "fieldName" : "termAttributionActors",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/source" : {
           "fieldName" : "termAttributionSources",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/time" : {
           "fieldName" : "termAttributionDates",
-          "fieldType" : "DATETIME"
+          "fieldType" : "DATETIME",
+          "queryByDefault" : false
         }
       }
     } ]
@@ -2294,7 +2300,7 @@
       "Searchable" : {
         "fieldName" : "managerLdap",
         "fieldType" : "URN",
-        "queryByDefault" : true
+        "queryByDefault" : false
       }
     }, {
       "name" : "departmentId",
@@ -2701,7 +2707,7 @@
               "type" : "com.linkedin.dataset.SchemaFieldPath",
               "doc" : "Flattened name of the field. Field is computed from jsonPath field.",
               "Searchable" : {
-                "boostScore" : 5.0,
+                "boostScore" : 1.0,
                 "fieldName" : "fieldPaths",
                 "fieldType" : "TEXT",
                 "queryByDefault" : "true"
@@ -2875,15 +2881,18 @@
               "Searchable" : {
                 "/tags/*/attribution/actor" : {
                   "fieldName" : "fieldTagAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/source" : {
                   "fieldName" : "fieldTagAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/time" : {
                   "fieldName" : "fieldTagAttributionDates",
-                  "fieldType" : "DATETIME"
+                  "fieldType" : "DATETIME",
+                  "queryByDefault" : false
                 },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
@@ -2905,15 +2914,18 @@
               "Searchable" : {
                 "/terms/*/attribution/actor" : {
                   "fieldName" : "fieldTermAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/source" : {
                   "fieldName" : "fieldTermAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/time" : {
                   "fieldName" : "fieldTermAttributionDates",
-                  "fieldType" : "DATETIME"
+                  "fieldType" : "DATETIME",
+                  "queryByDefault" : false
                 },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
@@ -3086,11 +3098,13 @@
               "Searchable" : {
                 "/tags/*/attribution/actor" : {
                   "fieldName" : "editedFieldTagAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/source" : {
                   "fieldName" : "editedFieldTagAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/time" : {
                   "fieldName" : "editedFieldTagAttributionDates",
@@ -3116,11 +3130,13 @@
               "Searchable" : {
                 "/terms/*/attribution/actor" : {
                   "fieldName" : "editedFieldTermAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/source" : {
                   "fieldName" : "editedFieldTermAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/time" : {
                   "fieldName" : "editedFieldTermAttributionDates",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
index 7f651a10139e2e..8c7595c5e505d8 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.operations.operations.snapshot.json
@@ -674,15 +674,18 @@
             "Searchable" : {
               "/actor" : {
                 "fieldName" : "tagAttributionActors",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/source" : {
                 "fieldName" : "tagAttributionSources",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/time" : {
                 "fieldName" : "tagAttributionDates",
-                "fieldType" : "DATETIME"
+                "fieldType" : "DATETIME",
+                "queryByDefault" : false
               }
             }
           } ]
@@ -801,15 +804,18 @@
       "Searchable" : {
         "/actor" : {
           "fieldName" : "termAttributionActors",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/source" : {
           "fieldName" : "termAttributionSources",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/time" : {
           "fieldName" : "termAttributionDates",
-          "fieldType" : "DATETIME"
+          "fieldType" : "DATETIME",
+          "queryByDefault" : false
         }
       }
     } ]
@@ -2288,7 +2294,7 @@
       "Searchable" : {
         "fieldName" : "managerLdap",
         "fieldType" : "URN",
-        "queryByDefault" : true
+        "queryByDefault" : false
       }
     }, {
       "name" : "departmentId",
@@ -2695,7 +2701,7 @@
               "type" : "com.linkedin.dataset.SchemaFieldPath",
               "doc" : "Flattened name of the field. Field is computed from jsonPath field.",
               "Searchable" : {
-                "boostScore" : 5.0,
+                "boostScore" : 1.0,
                 "fieldName" : "fieldPaths",
                 "fieldType" : "TEXT",
                 "queryByDefault" : "true"
@@ -2869,15 +2875,18 @@
               "Searchable" : {
                 "/tags/*/attribution/actor" : {
                   "fieldName" : "fieldTagAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/source" : {
                   "fieldName" : "fieldTagAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/time" : {
                   "fieldName" : "fieldTagAttributionDates",
-                  "fieldType" : "DATETIME"
+                  "fieldType" : "DATETIME",
+                  "queryByDefault" : false
                 },
                 "/tags/*/tag" : {
                   "boostScore" : 0.5,
@@ -2899,15 +2908,18 @@
               "Searchable" : {
                 "/terms/*/attribution/actor" : {
                   "fieldName" : "fieldTermAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/source" : {
                   "fieldName" : "fieldTermAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/time" : {
                   "fieldName" : "fieldTermAttributionDates",
-                  "fieldType" : "DATETIME"
+                  "fieldType" : "DATETIME",
+                  "queryByDefault" : false
                 },
                 "/terms/*/urn" : {
                   "boostScore" : 0.5,
@@ -3080,11 +3092,13 @@
               "Searchable" : {
                 "/tags/*/attribution/actor" : {
                   "fieldName" : "editedFieldTagAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/source" : {
                   "fieldName" : "editedFieldTagAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/tags/*/attribution/time" : {
                   "fieldName" : "editedFieldTagAttributionDates",
@@ -3110,11 +3124,13 @@
               "Searchable" : {
                 "/terms/*/attribution/actor" : {
                   "fieldName" : "editedFieldTermAttributionActors",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/source" : {
                   "fieldName" : "editedFieldTermAttributionSources",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 },
                 "/terms/*/attribution/time" : {
                   "fieldName" : "editedFieldTermAttributionDates",
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
index c3e04add825c94..75e5c9a559076b 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.platform.platform.snapshot.json
@@ -932,15 +932,18 @@
             "Searchable" : {
               "/actor" : {
                 "fieldName" : "tagAttributionActors",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/source" : {
                 "fieldName" : "tagAttributionSources",
-                "fieldType" : "URN"
+                "fieldType" : "URN",
+                "queryByDefault" : false
               },
               "/time" : {
                 "fieldName" : "tagAttributionDates",
-                "fieldType" : "DATETIME"
+                "fieldType" : "DATETIME",
+                "queryByDefault" : false
               }
             }
           } ]
@@ -1059,15 +1062,18 @@
       "Searchable" : {
         "/actor" : {
           "fieldName" : "termAttributionActors",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/source" : {
           "fieldName" : "termAttributionSources",
-          "fieldType" : "URN"
+          "fieldType" : "URN",
+          "queryByDefault" : false
         },
         "/time" : {
           "fieldName" : "termAttributionDates",
-          "fieldType" : "DATETIME"
+          "fieldType" : "DATETIME",
+          "queryByDefault" : false
         }
       }
     } ]
@@ -2777,7 +2783,7 @@
                     "Searchable" : {
                       "fieldName" : "managerLdap",
                       "fieldType" : "URN",
-                      "queryByDefault" : true
+                      "queryByDefault" : false
                     }
                   }, {
                     "name" : "departmentId",
@@ -3359,7 +3365,7 @@
                           "type" : "com.linkedin.dataset.SchemaFieldPath",
                           "doc" : "Flattened name of the field. Field is computed from jsonPath field.",
                           "Searchable" : {
-                            "boostScore" : 5.0,
+                            "boostScore" : 1.0,
                             "fieldName" : "fieldPaths",
                             "fieldType" : "TEXT",
                             "queryByDefault" : "true"
@@ -3533,15 +3539,18 @@
                           "Searchable" : {
                             "/tags/*/attribution/actor" : {
                               "fieldName" : "fieldTagAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/source" : {
                               "fieldName" : "fieldTagAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/time" : {
                               "fieldName" : "fieldTagAttributionDates",
-                              "fieldType" : "DATETIME"
+                              "fieldType" : "DATETIME",
+                              "queryByDefault" : false
                             },
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
@@ -3563,15 +3572,18 @@
                           "Searchable" : {
                             "/terms/*/attribution/actor" : {
                               "fieldName" : "fieldTermAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/source" : {
                               "fieldName" : "fieldTermAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/time" : {
                               "fieldName" : "fieldTermAttributionDates",
-                              "fieldType" : "DATETIME"
+                              "fieldType" : "DATETIME",
+                              "queryByDefault" : false
                             },
                             "/terms/*/urn" : {
                               "boostScore" : 0.5,
@@ -3744,11 +3756,13 @@
                           "Searchable" : {
                             "/tags/*/attribution/actor" : {
                               "fieldName" : "editedFieldTagAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/source" : {
                               "fieldName" : "editedFieldTagAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/tags/*/attribution/time" : {
                               "fieldName" : "editedFieldTagAttributionDates",
@@ -3774,11 +3788,13 @@
                           "Searchable" : {
                             "/terms/*/attribution/actor" : {
                               "fieldName" : "editedFieldTermAttributionActors",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/source" : {
                               "fieldName" : "editedFieldTermAttributionSources",
-                              "fieldType" : "URN"
+                              "fieldType" : "URN",
+                              "queryByDefault" : false
                             },
                             "/terms/*/attribution/time" : {
                               "fieldName" : "editedFieldTermAttributionDates",
@@ -5198,9 +5214,9 @@
                     },
                     "Searchable" : {
                       "/*" : {
-                        "boostScore" : 2.0,
                         "fieldName" : "isRelatedTerms",
-                        "fieldType" : "URN"
+                        "fieldType" : "URN",
+                        "queryByDefault" : false
                       }
                     }
                   }, {
@@ -5219,9 +5235,9 @@
                     },
                     "Searchable" : {
                       "/*" : {
-                        "boostScore" : 2.0,
                         "fieldName" : "hasRelatedTerms",
-                        "fieldType" : "URN"
+                        "fieldType" : "URN",
+                        "queryByDefault" : false
                       }
                     }
                   }, {