diff --git a/package.json b/package.json
index 86782515e..a6314050c 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@keen.io/parser": "^2.8.125",
     "@keen.io/pubsub": "^1.2.0",
     "@keen.io/query": "^1.1.1",
-    "@keen.io/query-creator": "^1.11.7",
+    "@keen.io/query-creator": "^1.11.8",
     "@keen.io/react-hooks": "^1.4.3",
     "@keen.io/time-utils": "^1.2.5",
     "@keen.io/toast-notifications": "^1.2.12",
diff --git a/public/index.html b/public/index.html
index c3096dca5..f1e4c8d18 100644
--- a/public/index.html
+++ b/public/index.html
@@ -27,6 +27,7 @@
      disableTimezoneSelection: false,
      onViewChange: (view, savedQuery) => {console.log("View changed: ", view, savedQuery)},
      confirmExtractionLimit: 5,
+     disableQueryFilterSuggestions: false,
      translations: <%= translationsConfig %>,
      dataviz: {
        theme: {
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index 8af5a7dc3..01e4bd101 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -281,7 +281,8 @@
     "filters": "Filters",
     "select": "Select",
     "event_stream": "Event Stream",
-    "tooltip": "so we know what properties are available"
+    "tooltip": "so we know what properties are available",
+    "matching_values": "Matching values"
   },
   "query_creator_filter_boolean": {
     "placeholder": "value"
diff --git a/src/KeenExplorer.tsx b/src/KeenExplorer.tsx
index 24acc6a78..b45f7a18a 100644
--- a/src/KeenExplorer.tsx
+++ b/src/KeenExplorer.tsx
@@ -58,6 +58,7 @@ export class KeenExplorer {
       createDashboardUrl,
       onViewChange,
       savedQuery,
+      disableQueryFilterSuggestions,
     } = props;
     const keenAnalysisClient =
       keenAnalysis.instance || new KeenAnalysis(keenAnalysis.config);
@@ -135,6 +136,7 @@ export class KeenExplorer {
                 enableDashboardsConnection: !!dashboardsApiUrl,
                 createDashboardUrl,
                 chartEventsPubSub,
+                disableQueryFilterSuggestions,
               }}
             >
               <ToastProvider>
diff --git a/src/components/Editor/components/Creator/Creator.tsx b/src/components/Editor/components/Creator/Creator.tsx
index 5c735f06f..53b8683d1 100644
--- a/src/components/Editor/components/Creator/Creator.tsx
+++ b/src/components/Editor/components/Creator/Creator.tsx
@@ -12,6 +12,8 @@ type Props = {
 
 const Creator: FC<Props> = ({ onUpdateQuery, onUpdateChartSettings }) => {
   const dispatch = useDispatch();
+  const { disableQueryFilterSuggestions } = useContext(AppContext);
+
   const {
     modalContainer,
     keenAnalysis: { config },
@@ -34,6 +36,7 @@ const Creator: FC<Props> = ({ onUpdateQuery, onUpdateChartSettings }) => {
       onUpdateChartSettings={onUpdateChartSettings}
       defaultTimezoneForQuery={defaultTimezoneForQuery}
       disableTimezoneSelection={disableTimezoneSelection}
+      disableFilterSuggestions={disableQueryFilterSuggestions}
     />
   );
 };
diff --git a/src/contexts/AppContext.ts b/src/contexts/AppContext.ts
index d55ee1215..443b4d007 100644
--- a/src/contexts/AppContext.ts
+++ b/src/contexts/AppContext.ts
@@ -14,6 +14,7 @@ const AppContext = React.createContext<{
   defaultTimezoneForQuery;
   disableTimezoneSelection;
   chartEventsPubSub: PubSub;
+  disableQueryFilterSuggestions: boolean;
 }>({
   keenAnalysis: null,
   modalContainer: null,
@@ -25,6 +26,7 @@ const AppContext = React.createContext<{
   defaultTimezoneForQuery: null,
   disableTimezoneSelection: null,
   chartEventsPubSub: null,
+  disableQueryFilterSuggestions: false,
 });
 
 export default AppContext;
diff --git a/src/types.ts b/src/types.ts
index 5a78723fa..a0b236968 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -94,6 +94,7 @@ export type Options = {
   confirmExtractionLimit?: number;
   onViewChange?: (view: Views) => {};
   savedQuery?: string;
+  disableQueryFilterSuggestions?: boolean;
 };
 
 type ComponentSettings =
diff --git a/yarn.lock b/yarn.lock
index f42eadb69..d7d740126 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1670,10 +1670,10 @@
   resolved "https://registry.yarnpkg.com/@keen.io/pubsub/-/pubsub-1.2.0.tgz#845b1647a231b3cb6a755581a08dada6a9ae655a"
   integrity sha512-LUrNaw2zvIqeJV1TLz/Gq6EspZAF7FY3vJmTopJtSyp1bFIwPQxuMnfqo/zLg5cemA9yRPKf/cEV5SDyQ9vL3w==
 
-"@keen.io/query-creator@^1.11.7":
-  version "1.11.7"
-  resolved "https://registry.yarnpkg.com/@keen.io/query-creator/-/query-creator-1.11.7.tgz#416168c906035763f2cd36d55cd9e2fa22821ca8"
-  integrity sha512-5tNDCZ8F3/ILIG4Rj0/8cabFW4qTYOgfHCB0SGSaSlH7Kmj7vKQUaiSrgcOC8zVgM3GQr8SiZOaHazTglybj5w==
+"@keen.io/query-creator@^1.11.8":
+  version "1.11.8"
+  resolved "https://registry.yarnpkg.com/@keen.io/query-creator/-/query-creator-1.11.8.tgz#fac98908cb2c3f3d47e56d5ad9d7d1d5137e0200"
+  integrity sha512-bxEDcYb4I7L3DC8UxEGq0QmlAPDirs2JJSiqvfqkQosARmo64xIIuEQTttjUA4Vo5B47SRlVwpkKnicMC90qNQ==
   dependencies:
     "@keen.io/colors" "^1.1.0"
     "@keen.io/icons" "^1.2.1"