diff --git a/packages/client/src/components/app/index.js b/packages/client/src/components/app/index.js
index 30d8ac2b7e..70074790ac 100644
--- a/packages/client/src/components/app/index.js
+++ b/packages/client/src/components/app/index.js
@@ -41,7 +41,6 @@ export * from "./forms"
 export * from "./table"
 export * from "./blocks"
 export * from "./dynamic-filter"
-export * from "./spreadsheet"
 
 // Deprecated component left for compatibility in old apps
 export { default as navigation } from "./deprecated/Navigation.svelte"
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 20ec66dcd7..accca79f88 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -8,6 +8,7 @@
   "dependencies": {
     "@budibase/bbui": "2.4.12-alpha.0",
     "@budibase/shared-core": "2.4.12-alpha.0",
+    "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
     "svelte": "^3.46.2"
diff --git a/packages/frontend-core/src/components/sheet/stores/rows.js b/packages/frontend-core/src/components/sheet/stores/rows.js
index 20d203354c..b7ce3b7ad2 100644
--- a/packages/frontend-core/src/components/sheet/stores/rows.js
+++ b/packages/frontend-core/src/components/sheet/stores/rows.js
@@ -1,5 +1,5 @@
 import { writable, derived, get } from "svelte/store"
-import { buildLuceneQuery } from "../../../utils/lucene"
+import { LuceneUtils } from "../../../index"
 import { fetchData } from "../../../fetch/fetchData"
 import { notifications } from "@budibase/bbui"
 
@@ -42,7 +42,9 @@ export const createRowsStore = context => {
   })
 
   // Local stores for managing fetching data
-  const query = derived(filter, $filter => buildLuceneQuery($filter))
+  const query = derived(filter, $filter =>
+    LuceneUtils.buildLuceneQuery($filter)
+  )
   const fetch = derived([tableId, query, sort], ([$tableId, $query, $sort]) => {
     if (!$tableId) {
       return null
diff --git a/packages/frontend-core/yarn.lock b/packages/frontend-core/yarn.lock
index 65f615d919..ce13e0848f 100644
--- a/packages/frontend-core/yarn.lock
+++ b/packages/frontend-core/yarn.lock
@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
+dayjs@^1.11.7:
+  version "1.11.7"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
+  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
+
 debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"