diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
index 7d2b5d5941..d4ed41efd3 100644
--- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
@@ -5,6 +5,7 @@
   import GridCell from "./GridCell.svelte"
   import { getColumnIcon } from "../lib/utils"
   import { debounce } from "../../../utils/utils"
+  import { FieldType, FormulaTypes } from "@budibase/types"
 
   export let column
   export let idx
@@ -29,7 +30,14 @@
     filter,
   } = getContext("grid")
 
-  const searchableTypes = ["string", "options", "number", "array", "longform"]
+  const searchableTypes = [
+    FieldType.STRING,
+    FieldType.OPTIONS,
+    FieldType.NUMBER,
+    FieldType.BIGINT,
+    FieldType.ARRAY,
+    FieldType.LONGFORM,
+  ]
 
   let anchor
   let open = false
@@ -42,21 +50,20 @@
   $: sortedBy = column.name === $sort.column
   $: canMoveLeft = orderable && idx > 0
   $: canMoveRight = orderable && idx < $renderedColumns.length - 1
-  $: ascendingLabel = ["number", "bigint"].includes(column.schema?.type)
-    ? "low-high"
-    : "A-Z"
-  $: descendingLabel = ["number", "bigint"].includes(column.schema?.type)
-    ? "high-low"
-    : "Z-A"
+  $: numericType = [FieldType.NUMBER, FieldType.BIGINT].includes(
+    column.schema?.type
+  )
+  $: ascendingLabel = numericType ? "low-high" : "A-Z"
+  $: descendingLabel = numericType ? "high-low" : "Z-A"
   $: searchable = isColumnSearchable(column)
   $: searching = searchValue != null
   $: debouncedUpdateFilter(searchValue)
 
   const isColumnSearchable = col => {
-    const type = col.schema.type
+    const { type, formulaType } = col.schema
     return (
       searchableTypes.includes(type) ||
-      (type === "formula" && col.schema.formulaType === "static")
+      (type === FieldType.FORMULA && formulaType === FormulaTypes.STATIC)
     )
   }
 
diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.js
index 984c2115ee..76c8c5d3ec 100644
--- a/packages/frontend-core/src/components/grid/stores/filter.js
+++ b/packages/frontend-core/src/components/grid/stores/filter.js
@@ -1,4 +1,5 @@
 import { writable, get } from "svelte/store"
+import { FieldType } from "@budibase/types"
 
 export const createStores = context => {
   const { props } = context
@@ -27,10 +28,12 @@ export const createActions = context => {
     }
 
     // Add overrides specific so the certain column type
-    if (type === "number") {
+    if (type === FieldType.NUMBER) {
       inlineFilter.value = parseFloat(value)
       inlineFilter.operator = "equal"
-    } else if (type === "array") {
+    } else if (type === FieldType.BIGINT) {
+      inlineFilter.operator = "equal"
+    } else if (type === FieldType.ARRAY) {
       inlineFilter.operator = "contains"
     }