diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eb878d2b54..2cfe328312 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,8 +4,6 @@ on:
  # Trigger the workflow on push with tags,
  # but only for the master branch
  push:
-  branches:
-    - master
   tags:
     - 'v*'
 
diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
index 0d996d539b..8638a21d79 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Input, DataList } from "@budibase/bbui"
+  import { Input, DataList, Select } from "@budibase/bbui"
   import { find, map, keys, reduce, keyBy } from "lodash/fp"
   import { pipe } from "components/common/core"
   import { EVENT_TYPE_MEMBER_NAME } from "components/common/eventHandlers"
@@ -29,7 +29,7 @@
       {/each}
     </Select>
   {:else if parameter.name === 'url'}
-    <DataList editable on:change bind:value={parameter.value}>
+    <DataList on:change bind:value={parameter.value}>
       <option value="" />
       {#each $store.allScreens as screen}
         <option value={screen.route}>{screen.props._instanceName}</option>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
index 8b1e0c5026..5011f8f173 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
@@ -1,6 +1,6 @@
 <script>
   // accepts an array of field names, and outputs an object of { FieldName: value }
-  import { DataList, Label, TextButton, Spacer } from "@budibase/bbui"
+  import { DataList, Label, TextButton, Spacer, Select } from "@budibase/bbui"
   import { store, backendUiStore } from "builderStore"
   import fetchBindableProperties from "builderStore/fetchBindableProperties"
   import { CloseCircleIcon, AddIcon } from "components/common/Icons"
@@ -81,18 +81,14 @@
       {/each}
     </Select>
     <Label size="m" color="dark">Value</Label>
-    <Select
-      editable
-      secondary
-      bind:value={field.value}
-      on:blur={rebuildParameters}>
+    <DataList secondary bind:value={field.value} on:blur={rebuildParameters}>
       <option value="" />
       {#each bindableProperties as bindableProp}
         <option value={toBindingExpression(bindableProp.readableBinding)}>
           {bindableProp.readableBinding}
         </option>
       {/each}
-    </Select>
+    </DataList>
     <div class="remove-field-container">
       <TextButton text small on:click={removeField(field)}>
         <CloseCircleIcon />