diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js
index 37e300e354..9b687e9844 100644
--- a/packages/frontend-core/src/fetch/DataFetch.js
+++ b/packages/frontend-core/src/fetch/DataFetch.js
@@ -1,13 +1,11 @@
 import { writable, derived, get } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import {
-  buildLuceneQuery,
-  luceneLimit,
-  runLuceneQuery,
-  luceneSort,
-} from "../utils/lucene"
+import { LuceneUtils } from "../utils"
 import { convertJSONSchemaToTableSchema } from "../utils/json"
 
+const { buildLuceneQuery, luceneLimit, runLuceneQuery, luceneSort } =
+  LuceneUtils
+
 /**
  * Parent class which handles the implementation of fetching data from an
  * internal table or datasource plus.
diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js
index 3ba3bf0fd4..6ac7c65c62 100644
--- a/packages/frontend-core/src/utils/index.js
+++ b/packages/frontend-core/src/utils/index.js
@@ -1,4 +1,4 @@
-export * as LuceneUtils from "./lucene"
+export { dataFilters as LuceneUtils } from "@budibase/shared-core"
 export * as JSONUtils from "./json"
 export * as CookieUtils from "./cookies"
 export * as RoleUtils from "./roles"
diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js
deleted file mode 100644
index 4b85c7d311..0000000000
--- a/packages/frontend-core/src/utils/lucene.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "@budibase/shared-core"
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index d5ab848051..7152c96f33 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -16,7 +16,7 @@ import { DataSourceOperation, FieldTypes } from "../constants"
 import { GoogleSpreadsheet } from "google-spreadsheet"
 import fetch from "node-fetch"
 import { configs, HTTPError } from "@budibase/backend-core"
-import { runLuceneQuery } from "@budibase/shared-core"
+import { dataFilters } from "@budibase/shared-core"
 
 interface GoogleSheetsConfig {
   spreadsheetId: string
@@ -359,7 +359,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
       await this.connect()
       const sheet = this.client.sheetsByTitle[query.sheet]
       const rows = await sheet.getRows()
-      const filtered = runLuceneQuery(rows, query.filters)
+      const filtered = dataFilters.runLuceneQuery(rows, query.filters)
       const headerValues = sheet.headerValues
       const response = []
       for (let row of filtered) {
diff --git a/packages/shared-core/src/index.ts b/packages/shared-core/src/index.ts
index 5506ead439..475894f381 100644
--- a/packages/shared-core/src/index.ts
+++ b/packages/shared-core/src/index.ts
@@ -1,2 +1,2 @@
 export * from "./constants"
-export * from "./filters"
+export * as dataFilters from "./filters"