diff --git a/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
index 5f67b4a0b0349b..0543e176f8867e 100644
--- a/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
@@ -85,15 +85,14 @@
       "type" : "string",
       "doc" : "Title of the chart",
       "Searchable" : {
+        "enableAutocomplete" : true,
         "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
       "type" : "string",
       "doc" : "Detailed description about the chart",
-      "Searchable" : {
-        "fieldType" : "TEXT"
-      }
+      "Searchable" : { }
     }, {
       "name" : "lastModified",
       "type" : {
@@ -340,8 +339,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -367,7 +365,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -536,8 +535,7 @@
           "addToFilters" : true,
           "boostScore" : 4.0,
           "fieldName" : "tool",
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "chartId",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
index f50d1a641be194..0f95ed3813bb15 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
@@ -227,8 +227,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -254,7 +253,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -393,8 +393,7 @@
           "Searchable" : {
             "boostScore" : 10.0,
             "enableAutocomplete" : true,
-            "fieldType" : "TEXT_PARTIAL",
-            "queryByDefault" : true
+            "fieldType" : "TEXT_PARTIAL"
           }
         }, {
           "name" : "description",
@@ -402,8 +401,7 @@
           "doc" : "Detailed description about the dashboard",
           "Searchable" : {
             "fieldType" : "TEXT",
-            "hasValuesFieldName" : "hasDescription",
-            "queryByDefault" : true
+            "hasValuesFieldName" : "hasDescription"
           }
         }, {
           "name" : "charts",
@@ -483,8 +481,7 @@
           "addToFilters" : true,
           "boostScore" : 4.0,
           "fieldName" : "tool",
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "dashboardId",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
index 083e23df744f68..7c11c6043e919a 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
@@ -189,8 +189,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -216,7 +215,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -365,8 +365,7 @@
           "Searchable" : {
             "boostScore" : 10.0,
             "enableAutocomplete" : true,
-            "fieldType" : "TEXT_PARTIAL",
-            "queryByDefault" : true
+            "fieldType" : "TEXT_PARTIAL"
           }
         }, {
           "name" : "description",
@@ -375,8 +374,7 @@
           "optional" : true,
           "Searchable" : {
             "fieldType" : "TEXT",
-            "hasValuesFieldName" : "hasDescription",
-            "queryByDefault" : true
+            "hasValuesFieldName" : "hasDescription"
           }
         }, {
           "name" : "project",
@@ -384,7 +382,8 @@
           "doc" : "Optional project/namespace associated with the flow",
           "optional" : true,
           "Searchable" : {
-            "fieldType" : "TEXT_PARTIAL"
+            "fieldType" : "TEXT_PARTIAL",
+            "queryByDefault" : false
           }
         } ],
         "Aspect" : {
@@ -424,8 +423,7 @@
         "type" : "string",
         "doc" : "Workflow manager like azkaban, airflow which orchestrates the flow",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "flowId",
@@ -433,16 +431,14 @@
         "doc" : "Unique Identifier of the data flow",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "cluster",
         "type" : "string",
         "doc" : "Cluster where the flow is executed",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
index a22eb5258bb0f2..4dda76d5d48b6d 100644
--- a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
@@ -257,8 +257,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -284,7 +283,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -420,8 +420,7 @@
           "Searchable" : {
             "boostScore" : 10.0,
             "enableAutocomplete" : true,
-            "fieldType" : "TEXT_PARTIAL",
-            "queryByDefault" : true
+            "fieldType" : "TEXT_PARTIAL"
           }
         }, {
           "name" : "description",
@@ -430,8 +429,7 @@
           "optional" : true,
           "Searchable" : {
             "fieldType" : "TEXT",
-            "hasValuesFieldName" : "hasDescription",
-            "queryByDefault" : true
+            "hasValuesFieldName" : "hasDescription"
           }
         }, {
           "name" : "type",
@@ -495,7 +493,8 @@
             "/*" : {
               "fieldName" : "inputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numInputDatasets"
+              "numValuesFieldName" : "numInputDatasets",
+              "queryByDefault" : false
             }
           }
         }, {
@@ -515,7 +514,8 @@
             "/*" : {
               "fieldName" : "outputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numOutputDatasets"
+              "numValuesFieldName" : "numOutputDatasets",
+              "queryByDefault" : false
             }
           }
         }, {
@@ -564,9 +564,14 @@
         "name" : "flow",
         "type" : "com.linkedin.common.Urn",
         "doc" : "Standardized data processing flow urn representing the flow for the job",
+        "Relationship" : {
+          "entityTypes" : [ "dataFlow" ],
+          "name" : "IsPartOf"
+        },
         "Searchable" : {
           "fieldName" : "dataFlow",
-          "fieldType" : "URN_PARTIAL"
+          "fieldType" : "URN_PARTIAL",
+          "queryByDefault" : false
         }
       }, {
         "name" : "jobId",
@@ -574,8 +579,7 @@
         "doc" : "Unique Identifier of the data job",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json
index cdd85cc29da51a..7ab48587b8fa9b 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json
@@ -131,7 +131,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -280,7 +281,8 @@
             "/*" : {
               "fieldName" : "inputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numInputDatasets"
+              "numValuesFieldName" : "numInputDatasets",
+              "queryByDefault" : false
             }
           }
         }, {
@@ -301,7 +303,8 @@
             "/*" : {
               "fieldName" : "outputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numOutputDatasets"
+              "numValuesFieldName" : "numOutputDatasets",
+              "queryByDefault" : false
             }
           }
         } ],
@@ -329,8 +332,7 @@
         "Searchable" : {
           "boostScore" : 4.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "orchestrator",
@@ -338,15 +340,15 @@
         "doc" : "Standardized Orchestrator where data process is defined.\nTODO: Migrate towards something that can be validated like DataPlatform urn",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "origin",
         "type" : "com.linkedin.common.FabricType",
         "doc" : "Fabric type where dataset belongs to or where it was generated.",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL"
+          "fieldType" : "TEXT_PARTIAL",
+          "queryByDefault" : false
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
index 83d1ec3e4f2680..4a92458edd666a 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
@@ -293,8 +293,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -409,7 +408,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -816,8 +816,7 @@
                 "doc" : "Flattened name of the field. Field is computed from jsonPath field. For data translation rules refer to wiki page above.",
                 "Searchable" : {
                   "fieldName" : "fieldPaths",
-                  "fieldType" : "TEXT_PARTIAL",
-                  "queryByDefault" : true
+                  "fieldType" : "TEXT_PARTIAL"
                 }
               }, {
                 "name" : "jsonPath",
@@ -837,8 +836,7 @@
                 "Searchable" : {
                   "boostScore" : 0.1,
                   "fieldName" : "fieldDescriptions",
-                  "fieldType" : "TEXT",
-                  "queryByDefault" : true
+                  "fieldType" : "TEXT"
                 }
               }, {
                 "name" : "type",
@@ -962,8 +960,7 @@
                   "/tags/*/tag" : {
                     "boostScore" : 0.5,
                     "fieldName" : "fieldTags",
-                    "fieldType" : "URN_PARTIAL",
-                    "queryByDefault" : true
+                    "fieldType" : "URN_PARTIAL"
                   }
                 }
               }, {
@@ -1064,8 +1061,7 @@
                 "Searchable" : {
                   "boostScore" : 0.1,
                   "fieldName" : "editedFieldDescriptions",
-                  "fieldType" : "TEXT",
-                  "queryByDefault" : true
+                  "fieldType" : "TEXT"
                 }
               }, {
                 "name" : "globalTags",
@@ -1076,8 +1072,7 @@
                   "/tags/*/tag" : {
                     "boostScore" : 0.5,
                     "fieldName" : "editedFieldTags",
-                    "fieldType" : "URN_PARTIAL",
-                    "queryByDefault" : true
+                    "fieldType" : "URN_PARTIAL"
                   }
                 }
               } ]
@@ -1124,7 +1119,8 @@
                 },
                 "Searchable" : {
                   "fieldName" : "upstreams",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 }
               }, {
                 "name" : "type",
@@ -1203,8 +1199,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "uri",
@@ -1308,8 +1303,7 @@
         "Searchable" : {
           "boostScore" : 10.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "origin",
@@ -1317,7 +1311,8 @@
         "doc" : "Fabric type where dataset belongs to or where it was generated.",
         "Searchable" : {
           "addToFilters" : true,
-          "fieldType" : "TEXT_PARTIAL"
+          "fieldType" : "TEXT_PARTIAL",
+          "queryByDefault" : false
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index ef2a43a9d8f0fe..d4174980301feb 100644
--- a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -85,15 +85,14 @@
       "type" : "string",
       "doc" : "Title of the chart",
       "Searchable" : {
+        "enableAutocomplete" : true,
         "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
       "type" : "string",
       "doc" : "Detailed description about the chart",
-      "Searchable" : {
-        "fieldType" : "TEXT"
-      }
+      "Searchable" : { }
     }, {
       "name" : "lastModified",
       "type" : {
@@ -712,8 +711,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -945,7 +943,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -1066,8 +1065,7 @@
       "Searchable" : {
         "boostScore" : 10.0,
         "enableAutocomplete" : true,
-        "fieldType" : "TEXT_PARTIAL",
-        "queryByDefault" : true
+        "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
@@ -1075,8 +1073,7 @@
       "doc" : "Detailed description about the dashboard",
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "charts",
@@ -1132,8 +1129,7 @@
       "Searchable" : {
         "boostScore" : 10.0,
         "enableAutocomplete" : true,
-        "fieldType" : "TEXT_PARTIAL",
-        "queryByDefault" : true
+        "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
@@ -1142,8 +1138,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "project",
@@ -1151,7 +1146,8 @@
       "doc" : "Optional project/namespace associated with the flow",
       "optional" : true,
       "Searchable" : {
-        "fieldType" : "TEXT_PARTIAL"
+        "fieldType" : "TEXT_PARTIAL",
+        "queryByDefault" : false
       }
     } ],
     "Aspect" : {
@@ -1170,8 +1166,7 @@
       "Searchable" : {
         "boostScore" : 10.0,
         "enableAutocomplete" : true,
-        "fieldType" : "TEXT_PARTIAL",
-        "queryByDefault" : true
+        "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
@@ -1180,8 +1175,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "type",
@@ -1236,7 +1230,8 @@
         "/*" : {
           "fieldName" : "inputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numInputDatasets"
+          "numValuesFieldName" : "numInputDatasets",
+          "queryByDefault" : false
         }
       }
     }, {
@@ -1256,7 +1251,8 @@
         "/*" : {
           "fieldName" : "outputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numOutputDatasets"
+          "numValuesFieldName" : "numOutputDatasets",
+          "queryByDefault" : false
         }
       }
     }, {
@@ -1352,7 +1348,8 @@
         "/*" : {
           "fieldName" : "inputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numInputDatasets"
+          "numValuesFieldName" : "numInputDatasets",
+          "queryByDefault" : false
         }
       }
     }, {
@@ -1373,7 +1370,8 @@
         "/*" : {
           "fieldName" : "outputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numOutputDatasets"
+          "numValuesFieldName" : "numOutputDatasets",
+          "queryByDefault" : false
         }
       }
     } ],
@@ -1460,8 +1458,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "uri",
@@ -1521,7 +1518,8 @@
       },
       "Searchable" : {
         "fieldName" : "upstreams",
-        "fieldType" : "URN"
+        "fieldType" : "URN",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -1585,8 +1583,7 @@
                       "addToFilters" : true,
                       "boostScore" : 4.0,
                       "fieldName" : "tool",
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "chartId",
@@ -1725,9 +1722,9 @@
                     "doc" : "The name of the AD/LDAP user.",
                     "Searchable" : {
                       "boostScore" : 2.0,
+                      "enableAutocomplete" : true,
                       "fieldName" : "ldap",
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -1811,7 +1808,6 @@
                     "optional" : true,
                     "Searchable" : {
                       "boostScore" : 10.0,
-                      "enableAutocomplete" : true,
                       "fieldType" : "TEXT_PARTIAL",
                       "queryByDefault" : true
                     }
@@ -1845,8 +1841,7 @@
                     "default" : [ ],
                     "Searchable" : {
                       "/*" : {
-                        "fieldType" : "TEXT",
-                        "queryByDefault" : true
+                        "fieldType" : "TEXT"
                       }
                     }
                   }, {
@@ -1859,8 +1854,7 @@
                     "default" : [ ],
                     "Searchable" : {
                       "/*" : {
-                        "fieldType" : "TEXT",
-                        "queryByDefault" : true
+                        "fieldType" : "TEXT"
                       }
                     }
                   }, {
@@ -1912,8 +1906,7 @@
                       "addToFilters" : true,
                       "boostScore" : 4.0,
                       "fieldName" : "tool",
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "dashboardId",
@@ -1959,8 +1952,7 @@
                     "type" : "string",
                     "doc" : "Workflow manager like azkaban, airflow which orchestrates the flow",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "flowId",
@@ -1968,16 +1960,14 @@
                     "doc" : "Unique Identifier of the data flow",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "cluster",
                     "type" : "string",
                     "doc" : "Cluster where the flow is executed",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -2018,9 +2008,14 @@
                     "name" : "flow",
                     "type" : "com.linkedin.common.Urn",
                     "doc" : "Standardized data processing flow urn representing the flow for the job",
+                    "Relationship" : {
+                      "entityTypes" : [ "dataFlow" ],
+                      "name" : "IsPartOf"
+                    },
                     "Searchable" : {
                       "fieldName" : "dataFlow",
-                      "fieldType" : "URN_PARTIAL"
+                      "fieldType" : "URN_PARTIAL",
+                      "queryByDefault" : false
                     }
                   }, {
                     "name" : "jobId",
@@ -2028,8 +2023,7 @@
                     "doc" : "Unique Identifier of the data job",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -2080,8 +2074,7 @@
                     "Searchable" : {
                       "boostScore" : 10.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "origin",
@@ -2089,7 +2082,8 @@
                     "doc" : "Fabric type where dataset belongs to or where it was generated.",
                     "Searchable" : {
                       "addToFilters" : true,
-                      "fieldType" : "TEXT_PARTIAL"
+                      "fieldType" : "TEXT_PARTIAL",
+                      "queryByDefault" : false
                     }
                   } ],
                   "Aspect" : {
@@ -2250,8 +2244,7 @@
                           "doc" : "Flattened name of the field. Field is computed from jsonPath field. For data translation rules refer to wiki page above.",
                           "Searchable" : {
                             "fieldName" : "fieldPaths",
-                            "fieldType" : "TEXT_PARTIAL",
-                            "queryByDefault" : true
+                            "fieldType" : "TEXT_PARTIAL"
                           }
                         }, {
                           "name" : "jsonPath",
@@ -2271,8 +2264,7 @@
                           "Searchable" : {
                             "boostScore" : 0.1,
                             "fieldName" : "fieldDescriptions",
-                            "fieldType" : "TEXT",
-                            "queryByDefault" : true
+                            "fieldType" : "TEXT"
                           }
                         }, {
                           "name" : "type",
@@ -2396,8 +2388,7 @@
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "fieldTags",
-                              "fieldType" : "URN_PARTIAL",
-                              "queryByDefault" : true
+                              "fieldType" : "URN_PARTIAL"
                             }
                           }
                         }, {
@@ -2493,8 +2484,7 @@
                           "Searchable" : {
                             "boostScore" : 0.1,
                             "fieldName" : "editedFieldDescriptions",
-                            "fieldType" : "TEXT",
-                            "queryByDefault" : true
+                            "fieldType" : "TEXT"
                           }
                         }, {
                           "name" : "globalTags",
@@ -2505,8 +2495,7 @@
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "editedFieldTags",
-                              "fieldType" : "URN_PARTIAL",
-                              "queryByDefault" : true
+                              "fieldType" : "URN_PARTIAL"
                             }
                           }
                         } ]
@@ -2555,8 +2544,7 @@
                     "Searchable" : {
                       "boostScore" : 4.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "orchestrator",
@@ -2564,15 +2552,15 @@
                     "doc" : "Standardized Orchestrator where data process is defined.\nTODO: Migrate towards something that can be validated like DataPlatform urn",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "origin",
                     "type" : "com.linkedin.common.FabricType",
                     "doc" : "Fabric type where dataset belongs to or where it was generated.",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL"
+                      "fieldType" : "TEXT_PARTIAL",
+                      "queryByDefault" : false
                     }
                   } ],
                   "Aspect" : {
@@ -2654,8 +2642,7 @@
                     "doc" : "Standardized platform urn for the model",
                     "Searchable" : {
                       "boostScore" : 0.1,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "name",
@@ -2664,15 +2651,15 @@
                     "Searchable" : {
                       "boostScore" : 10.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "origin",
                     "type" : "com.linkedin.common.FabricType",
                     "doc" : "Fabric type where model belongs to or where it was generated",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL"
+                      "fieldType" : "TEXT_PARTIAL",
+                      "queryByDefault" : false
                     }
                   } ],
                   "Aspect" : {
@@ -2690,8 +2677,7 @@
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT",
-                      "hasValuesFieldName" : "hasDescription",
-                      "queryByDefault" : true
+                      "hasValuesFieldName" : "hasDescription"
                     }
                   }, {
                     "name" : "date",
@@ -2709,8 +2695,7 @@
                     "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
                     "optional" : true,
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "hyperParameters",
@@ -3175,8 +3160,7 @@
                     "Searchable" : {
                       "boostScore" : 10.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -3236,8 +3220,7 @@
                     "type" : "string",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -3252,10 +3235,7 @@
                     "name" : "definition",
                     "type" : "string",
                     "doc" : "Definition of business term",
-                    "Searchable" : {
-                      "fieldType" : "TEXT",
-                      "queryByDefault" : true
-                    }
+                    "Searchable" : { }
                   }, {
                     "name" : "parentNode",
                     "type" : "com.linkedin.common.GlossaryNodeUrn",
@@ -3328,6 +3308,7 @@
                     "name" : "name",
                     "type" : "string",
                     "Searchable" : {
+                      "enableAutocomplete" : true,
                       "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
@@ -3343,10 +3324,7 @@
                     "name" : "definition",
                     "type" : "string",
                     "doc" : "Definition of business node",
-                    "Searchable" : {
-                      "fieldType" : "TEXT",
-                      "queryByDefault" : true
-                    }
+                    "Searchable" : { }
                   }, {
                     "name" : "parentNode",
                     "type" : "com.linkedin.common.GlossaryNodeUrn",
diff --git a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json
index 6f8a336dbe8cee..d619f72af96f08 100644
--- a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json
@@ -73,7 +73,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -182,10 +183,7 @@
           "name" : "definition",
           "type" : "string",
           "doc" : "Definition of business node",
-          "Searchable" : {
-            "fieldType" : "TEXT",
-            "queryByDefault" : true
-          }
+          "Searchable" : { }
         }, {
           "name" : "parentNode",
           "type" : "com.linkedin.common.GlossaryNodeUrn",
@@ -233,6 +231,7 @@
         "name" : "name",
         "type" : "string",
         "Searchable" : {
+          "enableAutocomplete" : true,
           "fieldType" : "TEXT_PARTIAL"
         }
       } ],
diff --git a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json
index 8d80f5a12019f1..45efdd86bcb460 100644
--- a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json
@@ -100,7 +100,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -218,10 +219,7 @@
           "name" : "definition",
           "type" : "string",
           "doc" : "Definition of business term",
-          "Searchable" : {
-            "fieldType" : "TEXT",
-            "queryByDefault" : true
-          }
+          "Searchable" : { }
         }, {
           "name" : "parentNode",
           "type" : "com.linkedin.common.GlossaryNodeUrn",
@@ -298,8 +296,7 @@
         "type" : "string",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json
index e6f8e0a3461006..6d0b4e9c882571 100644
--- a/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json
@@ -107,8 +107,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
diff --git a/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json
index 8cd7341a3ccc18..08c60f22374f6d 100644
--- a/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json
@@ -79,8 +79,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -212,7 +211,6 @@
           "optional" : true,
           "Searchable" : {
             "boostScore" : 10.0,
-            "enableAutocomplete" : true,
             "fieldType" : "TEXT_PARTIAL",
             "queryByDefault" : true
           }
@@ -250,8 +248,7 @@
           "default" : [ ],
           "Searchable" : {
             "/*" : {
-              "fieldType" : "TEXT",
-              "queryByDefault" : true
+              "fieldType" : "TEXT"
             }
           }
         }, {
@@ -264,8 +261,7 @@
           "default" : [ ],
           "Searchable" : {
             "/*" : {
-              "fieldType" : "TEXT",
-              "queryByDefault" : true
+              "fieldType" : "TEXT"
             }
           }
         }, {
@@ -319,9 +315,9 @@
         "doc" : "The name of the AD/LDAP user.",
         "Searchable" : {
           "boostScore" : 2.0,
+          "enableAutocomplete" : true,
           "fieldName" : "ldap",
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json
index fcc5220def9985..a1d1ca5bd502c1 100644
--- a/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json
@@ -365,7 +365,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -481,8 +482,7 @@
         "doc" : "Standardized platform urn for the model",
         "Searchable" : {
           "boostScore" : 0.1,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "name",
@@ -491,15 +491,15 @@
         "Searchable" : {
           "boostScore" : 10.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "origin",
         "type" : "com.linkedin.common.FabricType",
         "doc" : "Fabric type where model belongs to or where it was generated",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL"
+          "fieldType" : "TEXT_PARTIAL",
+          "queryByDefault" : false
         }
       } ],
       "Aspect" : {
@@ -517,8 +517,7 @@
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT",
-          "hasValuesFieldName" : "hasDescription",
-          "queryByDefault" : true
+          "hasValuesFieldName" : "hasDescription"
         }
       }, {
         "name" : "date",
@@ -536,8 +535,7 @@
         "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
         "optional" : true,
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "hyperParameters",
diff --git a/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json
index 3db7b7fbb4f273..916052801a32c2 100644
--- a/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json
@@ -65,7 +65,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -200,8 +201,7 @@
         "Searchable" : {
           "boostScore" : 10.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {