diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index 91dc369d80..5b71dd1b2d 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -1,24 +1,27 @@
 <script>
+  import { createEventDispatcher } from "svelte"
   import { queries } from "stores/backend"
   import { Select } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
 
+  const dispatch = createEventDispatcher()
+
   export let value
   export let bindings
 
   $: query = $queries.list.find(query => query._id === value?.queryId)
   $: parameters = query?.parameters ?? []
-
-  // Ensure any nullish queryId values get set to empty string so
-  // that the select works
-  $: if (value?.queryId == null) value = { queryId: "" }
 </script>
 
 <div class="block-field">
   <Select
     label="Query"
-    bind:value={value.queryId}
+    value={value.queryId}
+    on:change={e => {
+      value = { queryId: e.detail }
+      dispatch("change", value)
+    }}
     options={$queries.list}
     getOptionValue={query => query._id}
     getOptionLabel={query => query.name}
@@ -34,6 +37,7 @@
         value={value[field.name]}
         on:change={e => {
           value[field.name] = e.detail
+          dispatch("change", value)
         }}
         label={field.name}
         type="string"
diff --git a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
index 9019f4ee56..5d4dcf857a 100644
--- a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
@@ -6,7 +6,7 @@
 </script>
 
 <div class="block-field">
-  <Select bind:value secondary extraThin>
+  <Select on:change bind:value secondary extraThin>
     <option value="">Choose an option</option>
     {#each $queries.list as query}
       <option value={query._id}>{query.name}</option>
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index a60d9ecf31..559e8275db 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -38,7 +38,7 @@
         message: `${field} ${rowResponse.validationErrors[field][0]}`,
       }))
       return false
-    } else if (rowResponse.status === 500) {
+    } else if (rowResponse.status >= 400) {
       errors = [{ message: rowResponse.message }]
       return false
     }