diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte
index 4bc8a69445..d2c48c4fa4 100644
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@@ -44,6 +44,11 @@
 {/if}
 
 <style>
+  .buttons {
+    display: flex;
+    gap: var(--spacing-m);
+  }
+
   .drawer {
     position: absolute;
     bottom: 0;
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 64b7cff78d..354e0e4434 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -46,7 +46,6 @@
     block || $automationStore.selectedBlock,
     $automationStore.selectedAutomation?.automation?.definition
   )
-
   $: inputData = testData ? testData : block.inputs
   $: tableId = inputData ? inputData.tableId : null
   $: table = tableId
@@ -174,7 +173,7 @@
             slot="body"
             bind:filters={tempFilters}
             {bindings}
-            {schemaFields}
+            {table}
             panel={AutomationBindingPanel}
           />
         </Drawer>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index ef56c610bd..34fe1f692f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -16,17 +16,23 @@
   import { LuceneUtils, Constants } from "@budibase/frontend-core"
   import { getFields } from "helpers/searchFields"
 
+  // can pass in either the table, or the fields (if working in design,
+  // fields is easier to pass in from the dataBinding:getSchemaForDatasource fn
+  export let table
   export let schemaFields
   export let filters = []
   export let bindings = []
   export let panel = ClientBindingPanel
   export let allowBindings = true
 
-  $: enrichedSchemaFields = getFields(schemaFields || [])
+  let fields, enrichedSchemaFields
+  let fieldOptions, valueTypeOptions
+  $: fields = schemaFields ? schemaFields : getSchemaFields(table)
+  $: enrichedSchemaFields = getFields(fields || [], { allowLinks: table?.sql })
   $: fieldOptions = enrichedSchemaFields.map(field => field.name) || []
   $: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"]
 
-  const addFilter = () => {
+  function addFilter() {
     filters = [
       ...filters,
       {
@@ -39,17 +45,30 @@
     ]
   }
 
-  const removeFilter = id => {
+  function getSchemaFields(table) {
+    const base = table ? Object.values(table.schema) : []
+    // if internal table, can use the _id field as well
+    const isInternal = table && !table.sql
+    if (isInternal && !base.find(field => field.name === "_id")) {
+      base.push({ name: "_id", type: "string" })
+    }
+    if (isInternal && !base.find(field => field.name === "_rev")) {
+      base.push({ name: "_rev", type: "string" })
+    }
+    return base
+  }
+
+  function removeFilter(id) {
     filters = filters.filter(field => field.id !== id)
   }
 
-  const duplicateFilter = id => {
+  function duplicateFilter(id) {
     const existingFilter = filters.find(filter => filter.id === id)
     const duplicate = { ...existingFilter, id: generate() }
     filters = [...filters, duplicate]
   }
 
-  const onFieldChange = (expression, field) => {
+  function onFieldChange(expression, field) {
     // Update the field type
     expression.type = enrichedSchemaFields.find(x => x.name === field)?.type
 
@@ -72,7 +91,7 @@
     }
   }
 
-  const onOperatorChange = (expression, operator) => {
+  function onOperatorChange(expression, operator) {
     const noValueOptions = [
       Constants.OperatorOptions.Empty.value,
       Constants.OperatorOptions.NotEmpty.value,
@@ -83,7 +102,7 @@
     }
   }
 
-  const getFieldOptions = field => {
+  function getFieldOptions(field) {
     const schema = enrichedSchemaFields.find(x => x.name === field)
     return schema?.constraints?.inclusion || []
   }