diff --git a/lerna.json b/lerna.json
index c0559d8346..aafb6b22ce 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.13.7",
+  "version": "2.13.9",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 6a1e575ac9..8588a7157a 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -10,6 +10,7 @@ import {
   DatabaseDeleteIndexOpts,
   Document,
   isDocument,
+  RowResponse,
 } from "@budibase/types"
 import { getCouchInfo } from "./connections"
 import { directCouchUrlCall } from "./utils"
@@ -127,12 +128,19 @@ export class DatabaseImpl implements Database {
       keys: ids,
       include_docs: true,
     })
-    const NOT_FOUND = "not_found"
-    const rows = response.rows.filter(row => row.error !== NOT_FOUND)
+    const rowUnavailable = (row: RowResponse<T>) => {
+      // row is deleted - key lookup can return this
+      if (row.doc == null || ("deleted" in row.value && row.value.deleted)) {
+        return true
+      }
+      return row.error === "not_found"
+    }
+
+    const rows = response.rows.filter(row => !rowUnavailable(row))
     const someMissing = rows.length !== response.rows.length
     // some were filtered out - means some missing
     if (!opts?.allowMissing && someMissing) {
-      const missing = response.rows.filter(row => row.error === NOT_FOUND)
+      const missing = response.rows.filter(row => rowUnavailable(row))
       const missingIds = missing.map(row => row.key).join(", ")
       throw new Error(`Unable to get documents: ${missingIds}`)
     }
diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts
index 6f1b573718..701e262091 100644
--- a/packages/backend-core/src/redis/redis.ts
+++ b/packages/backend-core/src/redis/redis.ts
@@ -28,7 +28,6 @@ const DEFAULT_SELECT_DB = SelectableDatabase.DEFAULT
 // for testing just generate the client once
 let CLOSED = false
 let CLIENTS: { [key: number]: any } = {}
-0
 let CONNECTED = false
 
 // mock redis always connected
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index 26c1ced502..0ba502bbcb 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -11,6 +11,7 @@
   export let componentBindings
   export let bindings
   export let parseSettings
+  export let disabled
 
   const draggable = getContext("draggable")
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/CellEditor.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/CellEditor.svelte
deleted file mode 100644
index e70decc035..0000000000
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/CellEditor.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script>
-  import { DrawerContent, Drawer, Button, Icon } from "@budibase/bbui"
-  import ValidationDrawer from "components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte"
-  export let column
-  export let type
-
-  let drawer
-</script>
-
-<Icon name="Settings" hoverable size="S" on:click={drawer.show} />
-<Drawer bind:this={drawer} title="Field Validation">
-  <svelte:fragment slot="description">
-    "{column.name}" field validation
-  </svelte:fragment>
-  <Button cta slot="buttons" on:click={drawer.hide}>Save</Button>
-  <DrawerContent slot="body">
-    <div class="container">
-      <ValidationDrawer
-        slot="body"
-        bind:rules={column.validation}
-        fieldName={column.name}
-        {type}
-      />
-    </div>
-  </DrawerContent>
-</Drawer>
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/ColumnDrawer.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/ColumnDrawer.svelte
deleted file mode 100644
index 316bf56da3..0000000000
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/ColumnDrawer.svelte
+++ /dev/null
@@ -1,202 +0,0 @@
-<script>
-  import {
-    Button,
-    Icon,
-    DrawerContent,
-    Layout,
-    Select,
-    Label,
-    Body,
-    Input,
-  } from "@budibase/bbui"
-  import { flip } from "svelte/animate"
-  import { dndzone } from "svelte-dnd-action"
-  import { generate } from "shortid"
-  import CellEditor from "./CellEditor.svelte"
-
-  export let columns = []
-  export let options = []
-  export let schema = {}
-
-  const flipDurationMs = 150
-  let dragDisabled = true
-
-  $: unselectedColumns = getUnselectedColumns(options, columns)
-  $: columns.forEach(column => {
-    if (!column.id) {
-      column.id = generate()
-    }
-  })
-
-  const getUnselectedColumns = (allColumns, selectedColumns) => {
-    let optionsObj = {}
-    allColumns.forEach(option => {
-      optionsObj[option] = true
-    })
-    selectedColumns?.forEach(column => {
-      delete optionsObj[column.name]
-    })
-    return Object.keys(optionsObj)
-  }
-
-  const getRemainingColumnOptions = selectedColumn => {
-    if (!selectedColumn || unselectedColumns.includes(selectedColumn)) {
-      return unselectedColumns
-    }
-    return [selectedColumn, ...unselectedColumns]
-  }
-
-  const addColumn = () => {
-    columns = [...columns, {}]
-  }
-
-  const removeColumn = id => {
-    columns = columns.filter(column => column.id !== id)
-  }
-
-  const updateColumnOrder = e => {
-    columns = e.detail.items
-  }
-
-  const handleFinalize = e => {
-    updateColumnOrder(e)
-    dragDisabled = true
-  }
-
-  const addAllColumns = () => {
-    let newColumns = columns || []
-    options.forEach(field => {
-      const fieldSchema = schema[field]
-      const hasCol = columns && columns.findIndex(x => x.name === field) !== -1
-      if (!fieldSchema?.autocolumn && !hasCol) {
-        newColumns.push({
-          name: field,
-          displayName: field,
-        })
-      }
-    })
-    columns = newColumns
-  }
-
-  const reset = () => {
-    columns = []
-  }
-
-  const getFieldType = column => {
-    return `validation/${schema[column.name]?.type}`
-  }
-</script>
-
-<DrawerContent>
-  <div class="container">
-    <Layout noPadding gap="S">
-      {#if columns?.length}
-        <Layout noPadding gap="XS">
-          <div class="column">
-            <div />
-            <Label size="L">Column</Label>
-            <Label size="L">Label</Label>
-            <div />
-            <div />
-          </div>
-          <div
-            class="columns"
-            use:dndzone={{
-              items: columns,
-              flipDurationMs,
-              dropTargetStyle: { outline: "none" },
-              dragDisabled,
-            }}
-            on:finalize={handleFinalize}
-            on:consider={updateColumnOrder}
-          >
-            {#each columns as column (column.id)}
-              <div class="column" animate:flip={{ duration: flipDurationMs }}>
-                <div
-                  class="handle"
-                  aria-label="drag-handle"
-                  style={dragDisabled ? "cursor: grab" : "cursor: grabbing"}
-                  on:mousedown={() => (dragDisabled = false)}
-                >
-                  <Icon name="DragHandle" size="XL" />
-                </div>
-                <Select
-                  bind:value={column.name}
-                  placeholder="Column"
-                  options={getRemainingColumnOptions(column.name)}
-                  on:change={e => (column.displayName = e.detail)}
-                />
-                <Input bind:value={column.displayName} placeholder="Label" />
-                <CellEditor type={getFieldType(column)} bind:column />
-                <Icon
-                  name="Close"
-                  hoverable
-                  size="S"
-                  on:click={() => removeColumn(column.id)}
-                  disabled={columns.length === 1}
-                />
-              </div>
-            {/each}
-          </div>
-        </Layout>
-      {:else}
-        <div class="column">
-          <div class="wide">
-            <Body size="S">Add columns to be included in your form below.</Body>
-          </div>
-        </div>
-      {/if}
-      <div class="column">
-        <div class="buttons wide">
-          <Button secondary icon="Add" on:click={addColumn}>Add column</Button>
-          <Button secondary quiet on:click={addAllColumns}>
-            Add all columns
-          </Button>
-          {#if columns?.length}
-            <Button secondary quiet on:click={reset}>Reset columns</Button>
-          {/if}
-        </div>
-      </div>
-    </Layout>
-  </div>
-</DrawerContent>
-
-<style>
-  .container {
-    width: 100%;
-    max-width: 600px;
-    margin: 0 auto;
-  }
-  .columns {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    gap: var(--spacing-m);
-  }
-  .column {
-    gap: var(--spacing-l);
-    display: grid;
-    grid-template-columns: 20px 1fr 1fr 16px 16px;
-    align-items: center;
-    border-radius: var(--border-radius-s);
-    transition: background-color ease-in-out 130ms;
-  }
-  .column:hover {
-    background-color: var(--spectrum-global-color-gray-100);
-  }
-  .handle {
-    display: grid;
-    place-items: center;
-  }
-  .wide {
-    grid-column: 2 / -1;
-  }
-  .buttons {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    gap: var(--spacing-m);
-  }
-</style>
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 6c74705ab0..2b76bc6591 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { Toggle } from "@budibase/bbui"
   import { cloneDeep, isEqual } from "lodash/fp"
   import {
     getDatasourceForProvider,
@@ -25,6 +26,8 @@
   let sanitisedValue
   let unconfigured
 
+  let selectAll = true
+
   $: bindings = getBindableProperties($selectedScreen, componentInstance._id)
   $: actionType = componentInstance.actionType
   let componentBindings = []
@@ -145,16 +148,31 @@
     dispatch("change", getValidColumns(parentFieldsUpdated, options))
   }
 
-  const listUpdated = e => {
-    const parsedColumns = getValidColumns(e.detail, options)
+  const listUpdated = columns => {
+    const parsedColumns = getValidColumns(columns, options)
     dispatch("change", parsedColumns)
   }
 </script>
 
 <div class="field-configuration">
+  <div class="toggle-all">
+    <span />
+    <Toggle
+      on:change={() => {
+        let update = fieldList.map(field => ({
+          ...field,
+          active: selectAll,
+        }))
+        listUpdated(update)
+      }}
+      text=""
+      bind:value={selectAll}
+      thin
+    />
+  </div>
   {#if fieldList?.length}
     <DraggableList
-      on:change={listUpdated}
+      on:change={e => listUpdated(e.detail)}
       on:itemChange={processItemUpdate}
       items={fieldList}
       listItemKey={"_id"}
@@ -171,4 +189,21 @@
   .field-configuration :global(.spectrum-ActionButton) {
     width: 100%;
   }
+  .toggle-all {
+    display: flex;
+    justify-content: space-between;
+  }
+  .toggle-all :global(.spectrum-Switch) {
+    margin-right: 0px;
+    padding-right: calc(var(--spacing-s) - 1px);
+    min-height: unset;
+  }
+  .toggle-all :global(.spectrum-Switch .spectrum-Switch-switch) {
+    margin-top: 0px;
+  }
+  .toggle-all span {
+    color: var(--spectrum-global-color-gray-700);
+    font-size: 12px;
+    margin-left: calc(var(--spacing-s) - 1px);
+  }
 </style>