diff --git a/src/LogContext/components/LogContextUI.tsx b/src/LogContext/components/LogContextUI.tsx
index 1b11558..9d07f8f 100644
--- a/src/LogContext/components/LogContextUI.tsx
+++ b/src/LogContext/components/LogContextUI.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useCallback, useMemo } from "react";
-import { LogRowModel, Field as GrafanaField, getDefaultTimeRange } from '@grafana/data';
+import { LogRowModel, Field as GrafanaField } from '@grafana/data';
 import { ElasticsearchQuery as DataQuery } from '../../types';
 import { LuceneQueryEditor } from "../../components/LuceneQueryEditor";
 
@@ -54,8 +54,6 @@ export function LogContextUI(props: LogContextUIProps ){
   const {row, origQuery, updateQuery, runContextQuery } = props;
 
   const fieldsSuggestionTimeRange = useMemo(()=>createContextTimeRange(row.timeEpochMs), [row])
-  const defaultTimeRange = getDefaultTimeRange()
-  console.log("RANGES", fieldsSuggestionTimeRange, defaultTimeRange)
   const {fields, getSuggestions} = useDatasourceFields(props.datasource, fieldsSuggestionTimeRange);
 
   useEffect(()=>{
diff --git a/src/datasource/utils.ts b/src/datasource/utils.ts
index 672480c..02fc66a 100644
--- a/src/datasource/utils.ts
+++ b/src/datasource/utils.ts
@@ -17,9 +17,11 @@ export type Suggestion = {
 
 export function useDatasourceFields(datasource: BaseQuickwitDataSource, range: TimeRange) {
   const [fields, setFields] = useState<MetricFindValue[]>([]);
+
+  console.log('from', range.from.toString())
   useEffect(() => {
     if (datasource.getTagKeys) {
-      datasource.getTagKeys({ searchable: true, range: range}).then(setFields);
+      datasource.getTagKeys({ searchable: true, timeRange: range}).then(setFields);
     }
   }, [datasource, range, setFields]);
 
@@ -29,7 +31,7 @@ export function useDatasourceFields(datasource: BaseQuickwitDataSource, range: T
     const wordIsField = word.match(/([^:\s]+):"?([^"\s]*)"?/);
     if (wordIsField?.length) {
       const [_match, fieldName, _fieldValue] = wordIsField;
-      const candidateValues = await datasource.getTagValues({ key: fieldName });
+      const candidateValues = await datasource.getTagValues({ key: fieldName, timeRange: range });
       suggestions.from = fieldName.length + 1; // Replace only the value part
       suggestions.options = candidateValues.map(v => ({
         type: 'text',
@@ -46,7 +48,7 @@ export function useDatasourceFields(datasource: BaseQuickwitDataSource, range: T
     }
     return suggestions;
 
-  }, [datasource, fields]);
+  }, [datasource, fields, range]);
 
   return {fields, getSuggestions}
 }