diff --git a/src/LogContext/components/LogContextQueryBuilderSidebar.tsx b/src/LogContext/components/LogContextQueryBuilderSidebar.tsx
index 06ceffc..ffe7477 100644
--- a/src/LogContext/components/LogContextQueryBuilderSidebar.tsx
+++ b/src/LogContext/components/LogContextQueryBuilderSidebar.tsx
@@ -159,7 +159,6 @@ export function LogContextQueryBuilderSidebar(props: LogContextProps & QueryBuil
   }
 
   const renderFieldSection = (field: Field)=>{
-    console.log('FIELD', field)
     return (
       <CollapsableSection
             label={LogContextFieldSection(field)} 
diff --git a/src/components/LuceneQueryEditor.tsx b/src/components/LuceneQueryEditor.tsx
index 4e26181..f0bb3c8 100644
--- a/src/components/LuceneQueryEditor.tsx
+++ b/src/components/LuceneQueryEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useRef} from "react";
+import React, { useRef, useCallback } from "react";
 import { css } from "@emotion/css";
 
 import { LuceneQueryBuilder } from '@/QueryBuilder/lucene';
@@ -11,8 +11,8 @@ import {autocompletion, CompletionContext} from "@codemirror/autocomplete"
 export type LuceneQueryEditorProps = {
   placeholder?: string,
   builder: LuceneQueryBuilder,
-  autocompleter: (word: string)=>any,
-  onChange: (query: string)=>void
+  autocompleter: (word: string) => any,
+  onChange: (query: string) => void
 }
 
 export function LuceneQueryEditor(props: LuceneQueryEditorProps){
@@ -33,17 +33,20 @@ export function LuceneQueryEditor(props: LuceneQueryEditorProps){
     return diagnostics
   })
 
-  const autocomplete = useMemo(()=>autocompletion({
-    override: [async (context: CompletionContext)=>{
-      let word = context.matchBefore(/\S*/);
-      if (!word){ return null }
-      const suggestions = await props.autocompleter(word?.text);
-      return {
-        from: word.from + suggestions.from,
-        options: suggestions.options
-      }
-    }]
-  }),[props.autocompleter])
+
+  const {autocompleter} = props;
+  const datasourceCompletions = useCallback(async (context: CompletionContext)=>{
+    let word = context.matchBefore(/\S*/);
+    if (!word){ return null }
+    const suggestions = await autocompleter(word?.text);
+    return {
+      from: word.from + suggestions.from,
+      options: suggestions.options
+    }
+  },[autocompleter])
+
+
+  const autocomplete = autocompletion({ override: [datasourceCompletions] })
 
   return (<CodeMirror 
     ref={editorRef}
diff --git a/src/components/QueryEditor/index.tsx b/src/components/QueryEditor/index.tsx
index 692dffc..53af301 100644
--- a/src/components/QueryEditor/index.tsx
+++ b/src/components/QueryEditor/index.tsx
@@ -60,7 +60,7 @@ interface Props {
 export const ElasticSearchQueryField = ({ value, onChange }: { value?: string; onChange: (v: string) => void }) => {
   const styles = useStyles2(getStyles);
   const builder = useQueryBuilder();
-  const {query, setQuery} = builder;
+  const {setQuery} = builder;
   const datasource = useDatasource()
   const [fields, autocompleter] = useDatasourceFields(datasource);
 
@@ -68,10 +68,10 @@ export const ElasticSearchQueryField = ({ value, onChange }: { value?: string; o
     setQuery(value || '')
   }, [setQuery, value])
 
-  const onEditorChange = useCallback((query:string)=>{
+  const onEditorChange = useCallback((query: string)=>{
     setQuery(query);
     onChange(query)
-  },[query, setQuery])
+  },[setQuery, onChange])
 
   return (
     <div className={styles.queryItem}>
diff --git a/src/datasource.utils.ts b/src/datasource.utils.ts
index d779fb4..f110f2d 100644
--- a/src/datasource.utils.ts
+++ b/src/datasource.utils.ts
@@ -11,7 +11,9 @@ export function useDatasourceFields(datasource: QuickwitDataSource): [any[], (wo
   const [fields, setFields] = useState<any[]>([]);
 
   useEffect(() => {
-    datasource.getTagKeys({ searchable: true }).then(setFields);
+    if (datasource.getTagKeys) {
+      datasource.getTagKeys({ searchable: true }).then(setFields);
+    }
   }, [datasource, setFields]);
 
   const getSuggestions = useCallback(async (word: string) => {