diff --git a/lerna.json b/lerna.json
index be61b1ef9..aaafa6837 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.1.21",
+  "version": "0.1.22",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6f2cdd569..a98311942 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.34.6",
-    "@budibase/client": "^0.1.21",
+    "@budibase/client": "^0.1.22",
     "@budibase/colorpicker": "^1.0.1",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@sentry/browser": "5.19.1",
diff --git a/packages/builder/src/components/database/DataTable/popovers/Calculate.svelte b/packages/builder/src/components/database/DataTable/popovers/Calculate.svelte
index e86e7fc92..a736ff61e 100644
--- a/packages/builder/src/components/database/DataTable/popovers/Calculate.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/Calculate.svelte
@@ -52,14 +52,14 @@
   <div class="input-group-row">
     <p>The</p>
     <Select secondary thin bind:value={view.calculation}>
-      <option value={null} />
+      <option value="">Choose an option</option>
       {#each CALCULATIONS as calculation}
         <option value={calculation.key}>{calculation.name}</option>
       {/each}
     </Select>
     <p>of</p>
     <Select secondary thin bind:value={view.field}>
-      <option value={null} />
+      <option value="">Choose an option</option>
       {#each fields as field}
         <option value={field}>{field}</option>
       {/each}
diff --git a/packages/builder/src/components/database/DataTable/popovers/Export.svelte b/packages/builder/src/components/database/DataTable/popovers/Export.svelte
index b8f8847a0..00514edb9 100644
--- a/packages/builder/src/components/database/DataTable/popovers/Export.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/Export.svelte
@@ -47,6 +47,7 @@
 <Popover bind:this={dropdown} {anchor} align="left">
   <h5>Export Format</h5>
   <Select secondary thin bind:value={exportFormat}>
+    <option value={''}>Select an option</option>
     {#each FORMATS as format}
       <option value={format.key}>{format.name}</option>
     {/each}
@@ -66,6 +67,5 @@
     margin-top: var(--spacing-l);
     display: flex;
     justify-content: flex-end;
-    gap: var(--spacing-s);
   }
 </style>
diff --git a/packages/builder/src/components/database/DataTable/popovers/Filter.svelte b/packages/builder/src/components/database/DataTable/popovers/Filter.svelte
index 8f1b97253..e7ecdcb8b 100644
--- a/packages/builder/src/components/database/DataTable/popovers/Filter.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/Filter.svelte
@@ -106,17 +106,20 @@
         <p>Where</p>
       {:else}
         <Select secondary thin bind:value={filter.conjunction}>
+          <option value="">Choose an option</option>
           {#each CONJUNCTIONS as conjunction}
             <option value={conjunction.key}>{conjunction.name}</option>
           {/each}
         </Select>
       {/if}
       <Select secondary thin bind:value={filter.key}>
+        <option value="">Choose an option</option>
         {#each fields as field}
           <option value={field}>{field}</option>
         {/each}
       </Select>
       <Select secondary thin bind:value={filter.condition}>
+        <option value="">Choose an option</option>
         {#each CONDITIONS as condition}
           <option value={condition.key}>{condition.name}</option>
         {/each}
diff --git a/packages/builder/src/components/database/DataTable/popovers/GroupBy.svelte b/packages/builder/src/components/database/DataTable/popovers/GroupBy.svelte
index 1efef31a4..42da0e9c3 100644
--- a/packages/builder/src/components/database/DataTable/popovers/GroupBy.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/GroupBy.svelte
@@ -46,7 +46,7 @@
   <div class="input-group-row">
     <p>Group By</p>
     <Select secondary thin bind:value={view.groupBy}>
-      <option value={false} />
+      <option value="">Choose an option</option>
       {#each fields as field}
         <option value={field}>{field}</option>
       {/each}
diff --git a/packages/builder/src/components/settings/UserRow.svelte b/packages/builder/src/components/settings/UserRow.svelte
index 88477f02a..43ffc33fe 100644
--- a/packages/builder/src/components/settings/UserRow.svelte
+++ b/packages/builder/src/components/settings/UserRow.svelte
@@ -15,6 +15,7 @@
     name="Name"
     placeholder="Username" />
   <Select disabled={!editMode} bind:value={user.accessLevelId} thin>
+    <option value="">Choose an option</option>
     <option value="ADMIN">Admin</option>
     <option value="POWER_USER">Power User</option>
   </Select>
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index 2b92e0844..aced8bc0a 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -62,6 +62,7 @@
         name="Password"
         placeholder="Password" />
       <Select bind:value={accessLevelId} thin>
+        <option value="">Choose an option</option>
         <option value="ADMIN">Admin</option>
         <option value="POWER_USER">Power User</option>
       </Select>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/HandlerSelector.svelte b/packages/builder/src/components/userInterface/EventsEditor/HandlerSelector.svelte
deleted file mode 100644
index 287697321..000000000
--- a/packages/builder/src/components/userInterface/EventsEditor/HandlerSelector.svelte
+++ /dev/null
@@ -1,139 +0,0 @@
-<script>
-  import { Button, Select } from "@budibase/bbui"
-  import StateBindingCascader from "./StateBindingCascader.svelte"
-  import { find, map, keys, reduce, keyBy } from "lodash/fp"
-  import { pipe } from "components/common/core"
-  import {
-    EVENT_TYPE_MEMBER_NAME,
-    allHandlers,
-  } from "components/common/eventHandlers"
-  import { store } from "builderStore"
-
-  export let handler
-  export let onCreate
-  export let onChanged
-  export let onRemoved
-
-  export let index
-  export let newHandler
-
-  let eventOptions
-  let handlerType
-  let parameters = []
-
-  $: eventOptions = allHandlers()
-
-  $: {
-    if (handler) {
-      handlerType = handler[EVENT_TYPE_MEMBER_NAME]
-      parameters = Object.entries(handler.parameters).map(([name, value]) => ({
-        name,
-        value,
-      }))
-    } else {
-      // Empty Handler
-      handlerType = ""
-      parameters = []
-    }
-  }
-
-  const handlerChanged = (type, params) => {
-    const handlerParams = {}
-    for (let param of params) {
-      handlerParams[param.name] = param.value
-    }
-
-    const updatedHandler = {
-      [EVENT_TYPE_MEMBER_NAME]: type,
-      parameters: handlerParams,
-    }
-
-    onChanged(updatedHandler, index)
-  }
-
-  const handlerTypeChanged = e => {
-    const handlerType = eventOptions.find(
-      handler => handler.name === e.target.value
-    )
-    const defaultParams = handlerType.parameters.map(param => ({
-      name: param,
-      value: "",
-    }))
-
-    handlerChanged(handlerType.name, defaultParams)
-  }
-
-  const onParameterChanged = index => e => {
-    const value = e.target ? e.target.value : e
-    const newParams = [...parameters]
-    newParams[index].value = value
-    handlerChanged(handlerType, newParams)
-  }
-</script>
-
-<div class="type-selector-container {newHandler && 'new-handler'}">
-  <div class="handler-controls">
-    <div class="handler-option">
-      <span>Action</span>
-      <Select value={handlerType} on:change={handlerTypeChanged}>
-        <option />
-        {#each eventOptions as option}
-          <option value={option.name}>{option.name}</option>
-        {/each}
-      </Select>
-    </div>
-    {#if parameters}
-      <br />
-      {#each parameters as parameter, idx}
-        <StateBindingCascader on:change={onParameterChanged(idx)} {parameter} />
-      {/each}
-    {/if}
-    {#if parameters.length > 0}
-      <div class="button-container">
-        {#if newHandler}
-          <Button primary thin on:click={onCreate}>Add Action</Button>
-        {:else}
-          <Button outline thin on:click={onRemoved}>Remove Action</Button>
-        {/if}
-      </div>
-    {/if}
-  </div>
-</div>
-
-<style>
-  .type-selector-container {
-    display: grid;
-    grid-gap: 20px;
-    width: 100%;
-    background: rgba(223, 223, 223, 0.5);
-    border: 1px solid #dfdfdf;
-    margin-bottom: 18px;
-  }
-
-  .handler-option {
-    display: flex;
-    flex-direction: column;
-  }
-
-  .new-handler {
-    background: #fff;
-  }
-
-  .handler-controls {
-    display: grid;
-    grid-template-columns: 1fr;
-    grid-gap: 20px;
-    padding: 22px;
-  }
-
-  .button-container {
-    display: grid;
-    justify-items: end;
-  }
-
-  span {
-    font-size: 18px;
-    margin-bottom: 10px;
-    font-weight: 500;
-  }
-</style>
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f00d7a124..ad5614005 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budibase",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Budibase CLI",
   "repository": "https://github.com/Budibase/Budibase",
   "homepage": "https://www.budibase.com",
@@ -17,7 +17,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/server": "^0.1.21",
+    "@budibase/server": "^0.1.22",
     "@inquirer/password": "^0.0.6-alpha.0",
     "chalk": "^2.4.2",
     "dotenv": "^8.2.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 1f0ef2642..0cfdf53f4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.esm.mjs",
diff --git a/packages/server/package.json b/packages/server/package.json
index 9d808e0d8..ae90b7b8b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/server",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -42,7 +42,7 @@
   "author": "Michael Shanks",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.1.21",
+    "@budibase/client": "^0.1.22",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index ba3305d29..e3fac8c3d 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -13,7 +13,7 @@
     "dev:builder": "rollup -cw"
   },
   "devDependencies": {
-    "@budibase/client": "^0.1.21",
+    "@budibase/client": "^0.1.22",
     "@rollup/plugin-commonjs": "^11.1.0",
     "lodash": "^4.17.15",
     "rollup": "^1.11.0",
@@ -31,14 +31,13 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.1.21",
+  "version": "0.1.22",
   "license": "MIT",
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {
     "@beyonk/svelte-googlemaps": "^2.2.0",
-    "@budibase/bbui": "^1.34.6",
-    "@fortawesome/fontawesome-free": "^5.14.0",
     "@budibase/bbui": "^1.34.2",
+    "@fortawesome/fontawesome-free": "^5.14.0",
     "britecharts": "^2.16.1",
     "d3-selection": "^1.4.2",
     "fast-sort": "^2.2.0",