From b4c14bf8a60e565ed369be0f2e3606aee323ed3c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 15 Mar 2021 21:26:50 +0000
Subject: [PATCH 01/19] v0.8.10

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 6 +++---
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 8 ++++----
 packages/standard-components/package.json | 2 +-
 packages/string-templates/package.json    | 2 +-
 packages/worker/package.json              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lerna.json b/lerna.json
index f63871e1c..3a3a6597b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.9",
+  "version": "0.8.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 32389a985..9e5f7a6a2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.9",
+    "@budibase/client": "^0.8.10",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.9",
+    "@budibase/string-templates": "^0.8.10",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 192bacfbc..bb7325ff4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.9",
+    "@budibase/string-templates": "^0.8.10",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.9",
+    "@budibase/standard-components": "^0.8.10",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 0a53aa8f5..db3370b67 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.9",
-    "@budibase/string-templates": "^0.8.9",
+    "@budibase/client": "^0.8.10",
+    "@budibase/string-templates": "^0.8.10",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.9",
+    "@budibase/standard-components": "^0.8.10",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 3e937cff4..f3243a577 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.9",
+  "version": "0.8.10",
   "license": "MIT",
   "gitHead": "1b95326b20d1352d36305910259228b96a683dc7",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 6e0b57365..48f0f8d1a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1670fd729..e0b7301a2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From d64b80b1188a7834933a618810845c4df23b0edb Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@nedap.com>
Date: Thu, 18 Mar 2021 09:08:39 +0100
Subject: [PATCH 02/19] 1292 - add help menu items related to budibase instead
 of electron

---
 packages/server/src/electron.js | 113 +++++++++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/electron.js b/packages/server/src/electron.js
index 290c13e6a..f2770e1d4 100644
--- a/packages/server/src/electron.js
+++ b/packages/server/src/electron.js
@@ -1,4 +1,4 @@
-const { app, BrowserWindow, shell, dialog } = require("electron")
+const { app, BrowserWindow, shell, dialog, Menu } = require("electron")
 const { join } = require("./utilities/centralPath")
 const isDev = require("electron-is-dev")
 const { autoUpdater } = require("electron-updater")
@@ -8,7 +8,7 @@ const initialiseBudibase = require("./utilities/initialiseBudibase")
 const { budibaseAppsDir } = require("./utilities/budibaseDir")
 const { openNewGitHubIssue, debugInfo } = require("electron-util")
 const eventEmitter = require("./events")
-
+const isMac = process.platform === 'darwin';
 const budibaseDir = budibaseAppsDir()
 const envFile = join(budibaseDir, ".env")
 
@@ -87,6 +87,115 @@ async function startApp() {
     // dock icon is clicked and there are no other windows open.
     if (win === null) createWindow()
   })
+
+  const template = [
+    // { role: 'appMenu' }
+    ...(isMac ? [{
+      label: app.name,
+      submenu: [
+        { role: 'about' },
+        { type: 'separator' },
+        { role: 'services' },
+        { type: 'separator' },
+        { role: 'hide' },
+        { role: 'hideothers' },
+        { role: 'unhide' },
+        { type: 'separator' },
+        { role: 'quit' }
+      ]
+    }] : []),
+    // { role: 'fileMenu' }
+    {
+      label: 'File',
+      submenu: [
+        isMac ? { role: 'close' } : { role: 'quit' }
+      ]
+    },
+    // { role: 'editMenu' }
+    {
+      label: 'Edit',
+      submenu: [
+        { role: 'undo' },
+        { role: 'redo' },
+        { type: 'separator' },
+        { role: 'cut' },
+        { role: 'copy' },
+        { role: 'paste' },
+        ...(isMac ? [
+          { role: 'pasteAndMatchStyle' },
+          { role: 'delete' },
+          { role: 'selectAll' },
+          { type: 'separator' },
+          {
+            label: 'Speech',
+            submenu: [
+              { role: 'startSpeaking' },
+              { role: 'stopSpeaking' }
+            ]
+          }
+        ] : [
+          { role: 'delete' },
+          { type: 'separator' },
+          { role: 'selectAll' }
+        ])
+      ]
+    },
+    // { role: 'viewMenu' }
+    {
+      label: 'View',
+      submenu: [
+        { role: 'reload' },
+        { role: 'forceReload' },
+        { role: 'toggleDevTools' },
+        { type: 'separator' },
+        { role: 'resetZoom' },
+        { role: 'zoomIn' },
+        { role: 'zoomOut' },
+        { type: 'separator' },
+        { role: 'togglefullscreen' }
+      ]
+    },
+    // { role: 'windowMenu' }
+    {
+      label: 'Window',
+      submenu: [
+        { role: 'minimize' },
+        { role: 'zoom' },
+        ...(isMac ? [
+          { type: 'separator' },
+          { role: 'front' },
+          { type: 'separator' },
+          { role: 'window' }
+        ] : [
+          { role: 'close' }
+        ])
+      ]
+    },
+    {
+      role: 'help',
+      submenu: [
+        {
+          label: 'Learn More',
+          click: () => shell.openExternal('https://www.budibase.com/')
+        },
+        {
+          label: 'Documentation',
+          click: () => shell.openExternal('https://docs.budibase.com/')
+        },
+        {
+          label: 'Search issues',
+          click: () => shell.openExternal('https://github.com/Budibase/budibase/issues')
+        },
+        {
+          label: 'Community discussions',
+          click: () => shell.openExternal('https://github.com/Budibase/budibase/discussions')
+        },
+      ]
+    }
+  ]
+
+  const menu = Menu.buildFromTemplate(template)
+  Menu.setApplicationMenu(menu)
 }
 
 autoUpdater.on("update-downloaded", (event, releaseNotes, releaseName) => {

From cefd3b96432bcd56dd2be91d96e720d69b46a969 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Tue, 23 Mar 2021 20:32:22 +0100
Subject: [PATCH 03/19] fix build by running yarn format

---
 .../PropertyControls/ColorPicker.svelte       |  34 ++--
 packages/server/src/electron.js               | 155 +++++++++---------
 2 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
index 6235e744f..c777f7966 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
@@ -1,38 +1,42 @@
 <script>
-  import { createEventDispatcher } from 'svelte'
+  import { createEventDispatcher } from "svelte"
   import Colorpicker from "@budibase/colorpicker"
-  
-  const dispatch = createEventDispatcher();
+
+  const dispatch = createEventDispatcher()
 
   export let value
-  
-  const WAIT = 150;
-  
+
+  const WAIT = 150
+
   function throttle(callback, wait, immediate = false) {
-    let timeout = null 
+    let timeout = null
     let initialCall = true
-    
+
     return function() {
       const callNow = immediate && initialCall
       const next = () => {
         callback.apply(this, arguments)
         timeout = null
       }
-      
-      if (callNow) { 
+
+      if (callNow) {
         initialCall = false
         next()
       }
-  
+
       if (!timeout) {
         timeout = setTimeout(next, wait)
       }
     }
   }
-  
-  const onChange = throttle(e => {
-    dispatch('change', e.detail)
-  }, WAIT, true)
+
+  const onChange = throttle(
+    e => {
+      dispatch("change", e.detail)
+    },
+    WAIT,
+    true
+  )
 </script>
 
 <Colorpicker value={value || '#C4C4C4'} on:change={onChange} />
diff --git a/packages/server/src/electron.js b/packages/server/src/electron.js
index f2770e1d4..9f10384b1 100644
--- a/packages/server/src/electron.js
+++ b/packages/server/src/electron.js
@@ -8,7 +8,7 @@ const initialiseBudibase = require("./utilities/initialiseBudibase")
 const { budibaseAppsDir } = require("./utilities/budibaseDir")
 const { openNewGitHubIssue, debugInfo } = require("electron-util")
 const eventEmitter = require("./events")
-const isMac = process.platform === 'darwin';
+const isMac = process.platform === "darwin"
 const budibaseDir = budibaseAppsDir()
 const envFile = join(budibaseDir, ".env")
 
@@ -90,108 +90,109 @@ async function startApp() {
 
   const template = [
     // { role: 'appMenu' }
-    ...(isMac ? [{
-      label: app.name,
-      submenu: [
-        { role: 'about' },
-        { type: 'separator' },
-        { role: 'services' },
-        { type: 'separator' },
-        { role: 'hide' },
-        { role: 'hideothers' },
-        { role: 'unhide' },
-        { type: 'separator' },
-        { role: 'quit' }
-      ]
-    }] : []),
+    ...(isMac
+      ? [
+          {
+            label: app.name,
+            submenu: [
+              { role: "about" },
+              { type: "separator" },
+              { role: "services" },
+              { type: "separator" },
+              { role: "hide" },
+              { role: "hideothers" },
+              { role: "unhide" },
+              { type: "separator" },
+              { role: "quit" },
+            ],
+          },
+        ]
+      : []),
     // { role: 'fileMenu' }
     {
-      label: 'File',
-      submenu: [
-        isMac ? { role: 'close' } : { role: 'quit' }
-      ]
+      label: "File",
+      submenu: [isMac ? { role: "close" } : { role: "quit" }],
     },
     // { role: 'editMenu' }
     {
-      label: 'Edit',
+      label: "Edit",
       submenu: [
-        { role: 'undo' },
-        { role: 'redo' },
-        { type: 'separator' },
-        { role: 'cut' },
-        { role: 'copy' },
-        { role: 'paste' },
-        ...(isMac ? [
-          { role: 'pasteAndMatchStyle' },
-          { role: 'delete' },
-          { role: 'selectAll' },
-          { type: 'separator' },
-          {
-            label: 'Speech',
-            submenu: [
-              { role: 'startSpeaking' },
-              { role: 'stopSpeaking' }
+        { role: "undo" },
+        { role: "redo" },
+        { type: "separator" },
+        { role: "cut" },
+        { role: "copy" },
+        { role: "paste" },
+        ...(isMac
+          ? [
+              { role: "pasteAndMatchStyle" },
+              { role: "delete" },
+              { role: "selectAll" },
+              { type: "separator" },
+              {
+                label: "Speech",
+                submenu: [{ role: "startSpeaking" }, { role: "stopSpeaking" }],
+              },
             ]
-          }
-        ] : [
-          { role: 'delete' },
-          { type: 'separator' },
-          { role: 'selectAll' }
-        ])
-      ]
+          : [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
+      ],
     },
     // { role: 'viewMenu' }
     {
-      label: 'View',
+      label: "View",
       submenu: [
-        { role: 'reload' },
-        { role: 'forceReload' },
-        { role: 'toggleDevTools' },
-        { type: 'separator' },
-        { role: 'resetZoom' },
-        { role: 'zoomIn' },
-        { role: 'zoomOut' },
-        { type: 'separator' },
-        { role: 'togglefullscreen' }
-      ]
+        { role: "reload" },
+        { role: "forceReload" },
+        { role: "toggleDevTools" },
+        { type: "separator" },
+        { role: "resetZoom" },
+        { role: "zoomIn" },
+        { role: "zoomOut" },
+        { type: "separator" },
+        { role: "togglefullscreen" },
+      ],
     },
     // { role: 'windowMenu' }
     {
-      label: 'Window',
+      label: "Window",
       submenu: [
-        { role: 'minimize' },
-        { role: 'zoom' },
-        ...(isMac ? [
-          { type: 'separator' },
-          { role: 'front' },
-          { type: 'separator' },
-          { role: 'window' }
-        ] : [
-          { role: 'close' }
-        ])
-      ]
+        { role: "minimize" },
+        { role: "zoom" },
+        ...(isMac
+          ? [
+              { type: "separator" },
+              { role: "front" },
+              { type: "separator" },
+              { role: "window" },
+            ]
+          : [{ role: "close" }]),
+      ],
     },
     {
-      role: 'help',
+      role: "help",
       submenu: [
         {
-          label: 'Learn More',
-          click: () => shell.openExternal('https://www.budibase.com/')
+          label: "Learn More",
+          click: () => shell.openExternal("https://www.budibase.com/"),
         },
         {
-          label: 'Documentation',
-          click: () => shell.openExternal('https://docs.budibase.com/')
+          label: "Documentation",
+          click: () => shell.openExternal("https://docs.budibase.com/"),
         },
         {
-          label: 'Search issues',
-          click: () => shell.openExternal('https://github.com/Budibase/budibase/issues')
+          label: "Search issues",
+          click: () =>
+            shell.openExternal("https://github.com/Budibase/budibase/issues"),
         },
         {
-          label: 'Community discussions',
-          click: () => shell.openExternal('https://github.com/Budibase/budibase/discussions')
+          label: "Community discussions",
+          click: () =>
+            shell.openExternal(
+              "https://github.com/Budibase/budibase/discussions"
+            ),
         },
-      ]
-    }
+      ],
+    },
   ]
 
   const menu = Menu.buildFromTemplate(template)

From 4d550d65a2aea55dfad0098d858c2bbc772e358b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 24 Mar 2021 15:30:15 +0000
Subject: [PATCH 04/19] Update release.yml

---
 .github/workflows/release.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 14c0cc06a..c8a4fb180 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,6 +1,13 @@
 name: Budibase Release
 
 on: 
+ workflow_dispatch:
+  inputs:
+      name:
+        description: 'Version'
+        required: false
+        default: '0.8'
+        
  # Trigger the workflow on push with tags,
  # but only for the master branch
  push:

From 9a47528775ee3941b72d1702c21021e028e687c1 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 24 Mar 2021 18:48:26 +0000
Subject: [PATCH 05/19] v0.8.11

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 6 +++---
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 8 ++++----
 packages/standard-components/package.json | 2 +-
 packages/string-templates/package.json    | 2 +-
 packages/worker/package.json              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lerna.json b/lerna.json
index 3a3a6597b..2291c7a7a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.10",
+  "version": "0.8.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9e5f7a6a2..9dd00acfc 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.10",
+    "@budibase/client": "^0.8.11",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.10",
+    "@budibase/string-templates": "^0.8.11",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index bb7325ff4..f090cbf7f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.10",
+    "@budibase/string-templates": "^0.8.11",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.10",
+    "@budibase/standard-components": "^0.8.11",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index db3370b67..b65247d03 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.10",
-    "@budibase/string-templates": "^0.8.10",
+    "@budibase/client": "^0.8.11",
+    "@budibase/string-templates": "^0.8.11",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.10",
+    "@budibase/standard-components": "^0.8.11",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index f3243a577..cd20d7fff 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.10",
+  "version": "0.8.11",
   "license": "MIT",
   "gitHead": "1b95326b20d1352d36305910259228b96a683dc7",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 48f0f8d1a..67f4d3c5d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e0b7301a2..1667e27a5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From bbdd9351f0a1a6ca58dd076d44478fd75e640870 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Thu, 25 Mar 2021 10:27:48 +0000
Subject: [PATCH 06/19] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c8a4fb180..1f2cb80d1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -59,8 +59,8 @@ jobs:
 
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
-          # windows_certs: ${{ secrets.windows_certs }}
-          # windows_certs_password: ${{ secrets.windows_certs_password }}
+          windows_certs: ${{ secrets.windows_certs }}
+          windows_certs_password: ${{ secrets.windows_certs_password }}
 
           # release the app after building
           release: ${{ startsWith(github.ref, 'refs/tags/v') }}

From 6f2a1d45cc091088f33e9526b7a92934b334c305 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 25 Mar 2021 10:40:08 +0000
Subject: [PATCH 07/19] v0.8.12

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 6 +++---
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 8 ++++----
 packages/standard-components/package.json | 2 +-
 packages/string-templates/package.json    | 2 +-
 packages/worker/package.json              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2291c7a7a..5d71dc202 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.11",
+  "version": "0.8.12",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9dd00acfc..3db29b060 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.11",
+    "@budibase/client": "^0.8.12",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.11",
+    "@budibase/string-templates": "^0.8.12",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index f090cbf7f..af80ac21f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.11",
+    "@budibase/string-templates": "^0.8.12",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.11",
+    "@budibase/standard-components": "^0.8.12",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index b65247d03..c6a051911 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.11",
-    "@budibase/string-templates": "^0.8.11",
+    "@budibase/client": "^0.8.12",
+    "@budibase/string-templates": "^0.8.12",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.11",
+    "@budibase/standard-components": "^0.8.12",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index cd20d7fff..451db3320 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.11",
+  "version": "0.8.12",
   "license": "MIT",
   "gitHead": "1b95326b20d1352d36305910259228b96a683dc7",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 67f4d3c5d..c5ee74f2d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1667e27a5..adc219a22 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From b7a31f9a43df4fa951350246db2b0b05a3828398 Mon Sep 17 00:00:00 2001
From: Theo Melo <9499829+theomelo@users.noreply.github.com>
Date: Thu, 1 Apr 2021 11:43:47 -0700
Subject: [PATCH 08/19] fix(README): Broken troubeshooting link

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 04bb71fb5..d60cb52f5 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
     <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Budibase/budibase">
   </a>
   <a href="https://discord.gg/rCYayfe">
-    <img alt="Discord" src="https://img.shields.io/discord/733030666647765003">  
+    <img alt="Discord" src="https://img.shields.io/discord/733030666647765003">
   </a>
   <a href="https://twitter.com/intent/follow?screen_name=budibase">
     <img src="https://img.shields.io/twitter/follow/budibase?style=social" alt="Follow @budibase" />
@@ -58,9 +58,9 @@
 
 
 ## ✨ Features
-When other platforms chose the closed source route, we decided to go open source. When other platforms chose cloud builders, we decided a local builder offered the better developer experience. We like to do things differently at Budibase. 
+When other platforms chose the closed source route, we decided to go open source. When other platforms chose cloud builders, we decided a local builder offered the better developer experience. We like to do things differently at Budibase.
 
-- **Build and ship real software.** Unlike other platforms, with Budibase you build and ship single page applications. Budibase applications have performance baked in and can be designed responsively, providing your users with a great experience. 
+- **Build and ship real software.** Unlike other platforms, with Budibase you build and ship single page applications. Budibase applications have performance baked in and can be designed responsively, providing your users with a great experience.
 
 - **Open source and extensable.** Budibase is open-source. The builder is licensed AGPL v3, the server is GPL v3, and the client is MPL. This should fill you with confidence that Budibase will always be around. You can also code against Budibase or fork it and make changes as you please, providing a developer-friendly experience.
 
@@ -83,7 +83,7 @@ When other platforms chose the closed source route, we decided to go open source
 - [x] Public Beta: Anyone can [sign-up and use Budibase](https://portal.budi.live/signup).
 - [ ] Official Launch
 
-Watch "releases" of this repo to get notified of major updates, and give the star button a click whilst you're there. 
+Watch "releases" of this repo to get notified of major updates, and give the star button a click whilst you're there.
 
 <p align="center">
   <img src="https://i.imgur.com/cJpgqm8.png">
@@ -93,7 +93,7 @@ Watch "releases" of this repo to get notified of major updates, and give the sta
 
 [![Stargazers over time](https://starchart.cc/Budibase/budibase.svg)](https://starchart.cc/Budibase/budibase)
 
-If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/master/CONTRIBUTING.md#troubleshooting) to clear down your environment.
+If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/next/.github/CONTRIBUTING.md#troubleshooting) to clear down your environment.
 
 
 ## 🏁 Getting Started with Budibase
@@ -131,14 +131,14 @@ Checkout our [Public Roadmap](https://github.com/Budibase/budibase/projects/10).
 
 ## ❗ Code of Conduct
 
-Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/master/.github/CODE_OF_CONDUCT.md). Please read it. 
+Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/master/.github/CODE_OF_CONDUCT.md). Please read it.
 
 ## 🙌 Contributing to Budibase
 
 From opening a bug report to creating a pull request: every contribution is appreciated and welcomed. If you're planning to implement a new feature or change the API please create an issue first. This way we can ensure your work is not in vain.
 
 ### Not Sure Where to Start?
-A good place to start contributing, is the [First time issues project](https://github.com/Budibase/budibase/projects/22). 
+A good place to start contributing, is the [First time issues project](https://github.com/Budibase/budibase/projects/22).
 
 ### How the repository is organized
 Budibase is a monorepo managed by lerna. Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up Budibase.

From 155824d652fa5eace79e6887cd109864abbab584 Mon Sep 17 00:00:00 2001
From: Theo Melo <9499829+theomelo@users.noreply.github.com>
Date: Thu, 1 Apr 2021 11:52:23 -0700
Subject: [PATCH 09/19] fix(README) Update places referencing old default
 branch name

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d60cb52f5..d3db6144b 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,7 @@ Checkout our [Public Roadmap](https://github.com/Budibase/budibase/projects/10).
 
 ## ❗ Code of Conduct
 
-Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/master/.github/CODE_OF_CONDUCT.md). Please read it.
+Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/next/.github/CODE_OF_CONDUCT.md). Please read it.
 
 ## 🙌 Contributing to Budibase
 
@@ -143,13 +143,13 @@ A good place to start contributing, is the [First time issues project](https://g
 ### How the repository is organized
 Budibase is a monorepo managed by lerna. Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up Budibase.
 
-- [packages/builder](https://github.com/Budibase/budibase/tree/master/packages/builder) - contains code for the budibase builder client side svelte application.
+- [packages/builder](https://github.com/Budibase/budibase/tree/next/packages/builder) - contains code for the budibase builder client side svelte application.
 
-- [packages/client](https://github.com/Budibase/budibase/tree/master/packages/client) - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
+- [packages/client](https://github.com/Budibase/budibase/tree/next/packages/client) - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
 
-- [packages/server](https://github.com/Budibase/budibase/tree/master/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
+- [packages/server](https://github.com/Budibase/budibase/tree/next/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
 
-For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/master/.github/CONTRIBUTING.md)
+For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/next/.github/CONTRIBUTING.md)
 
 ## 📝 License
 

From 1f473c0649848aac48aff4cf829462fb667f2a65 Mon Sep 17 00:00:00 2001
From: Theo Melo <9499829+theomelo@users.noreply.github.com>
Date: Wed, 7 Apr 2021 15:27:06 -0700
Subject: [PATCH 10/19] fix(README): References to HEAD

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d3db6144b..5ecf9d3ec 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@
   </a>
   <img src="https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg" alt="Code of conduct" />
   <a href="https://codecov.io/gh/Budibase/budibase">
-    <img src="https://codecov.io/gh/Budibase/budibase/branch/next/graph/badge.svg?token=E8W2ZFXQOH"/>
+    <img src="https://codecov.io/gh/Budibase/budibase/branch/HEAD/graph/badge.svg?token=E8W2ZFXQOH"/>
   </a>
 </p>
 
@@ -93,7 +93,7 @@ Watch "releases" of this repo to get notified of major updates, and give the sta
 
 [![Stargazers over time](https://starchart.cc/Budibase/budibase.svg)](https://starchart.cc/Budibase/budibase)
 
-If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/next/.github/CONTRIBUTING.md#troubleshooting) to clear down your environment.
+If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting) to clear down your environment.
 
 
 ## 🏁 Getting Started with Budibase
@@ -131,7 +131,7 @@ Checkout our [Public Roadmap](https://github.com/Budibase/budibase/projects/10).
 
 ## ❗ Code of Conduct
 
-Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/next/.github/CODE_OF_CONDUCT.md). Please read it.
+Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md). Please read it.
 
 ## 🙌 Contributing to Budibase
 
@@ -143,13 +143,13 @@ A good place to start contributing, is the [First time issues project](https://g
 ### How the repository is organized
 Budibase is a monorepo managed by lerna. Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up Budibase.
 
-- [packages/builder](https://github.com/Budibase/budibase/tree/next/packages/builder) - contains code for the budibase builder client side svelte application.
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - contains code for the budibase builder client side svelte application.
 
-- [packages/client](https://github.com/Budibase/budibase/tree/next/packages/client) - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
 
-- [packages/server](https://github.com/Budibase/budibase/tree/next/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
 
-For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/next/.github/CONTRIBUTING.md)
+For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
 
 ## 📝 License
 

From 83abf8111b46e5d47d7bb1edc079b5b3dc486165 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Sun, 11 Apr 2021 12:02:01 +0100
Subject: [PATCH 11/19] fix automation fields

---
 .../EditAutomationPopover.svelte              |  4 +-
 .../automation/SetupPanel/RowSelector.svelte  |  2 +-
 .../common/DrawerBindableInput.svelte         |  7 ++-
 .../deploy/DeploymentHistory.svelte           |  6 ++-
 .../automate/[automation]/index.svelte        |  3 +-
 .../pages/[application]/automate/index.svelte | 23 ++++----
 .../pages/[application]/data/_layout.svelte   |  9 ++--
 .../[query]/_layout.svelte                    |  4 +-
 .../data/datasource/index.svelte              | 53 ++++++++++---------
 9 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index a99a16e24..81c38e553 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,4 +1,4 @@
-<script>    
+<script>
   import { goto } from "@sveltech/routify"
   import { automationStore, backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
@@ -24,7 +24,7 @@
       automation,
     })
     notifier.success("Automation deleted.")
-    $goto('../automate')
+    $goto("../automate")
   }
 </script>
 
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 4fcdb6cd8..4f36e6157 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,6 +1,6 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { Select } from "@budibase/bbui"
+  import { Select, Label } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "./AutomationBindingPanel.svelte"
 
diff --git a/packages/builder/src/components/common/DrawerBindableInput.svelte b/packages/builder/src/components/common/DrawerBindableInput.svelte
index 647638e8c..e7723aba8 100644
--- a/packages/builder/src/components/common/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/DrawerBindableInput.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon, Input, Drawer, Body, Button } from "@budibase/bbui"
+  import { Icon, Input, Drawer, Label, Body, Button } from "@budibase/bbui"
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
@@ -14,6 +14,7 @@
   export let thin = true
   export let title = "Bindings"
   export let placeholder
+  export let label
 
   let bindingDrawer
 
@@ -32,6 +33,7 @@
 
 <div class="control">
   <Input
+    {label}
     {thin}
     value={readableValue}
     on:change={event => onChange(event.target.value)}
@@ -67,7 +69,6 @@
 
   .icon {
     right: 2px;
-    top: 2px;
     bottom: 2px;
     position: absolute;
     align-items: center;
@@ -80,7 +81,9 @@
     border-bottom-right-radius: var(--border-radius-m);
     color: var(--grey-7);
     font-size: 14px;
+    height: 40px;
   }
+
   .icon:hover {
     color: var(--ink);
     cursor: pointer;
diff --git a/packages/builder/src/components/deploy/DeploymentHistory.svelte b/packages/builder/src/components/deploy/DeploymentHistory.svelte
index c49abd433..0933b1a67 100644
--- a/packages/builder/src/components/deploy/DeploymentHistory.svelte
+++ b/packages/builder/src/components/deploy/DeploymentHistory.svelte
@@ -119,11 +119,13 @@
             {#if deployment.status.toLowerCase() === 'pending'}
               <Spinner size="10" />
             {/if}
-            <div on:click={() => showErrorReasonModal(deployment.err)} class={`deployment-status ${deployment.status}`}>
+            <div
+              on:click={() => showErrorReasonModal(deployment.err)}
+              class={`deployment-status ${deployment.status}`}>
               <span>
                 {deployment.status}
                 {#if deployment.status === DeploymentStatus.FAILURE}
-                  <i class="ri-information-line"/>
+                  <i class="ri-information-line" />
                 {/if}
               </span>
             </div>
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte
index 031a72fad..1a15ed48c 100644
--- a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte
+++ b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte
@@ -1,6 +1,5 @@
 <script>
   import AutomationBuilder from "components/automation/AutomationBuilder/AutomationBuilder.svelte"
 </script>
-  
+
 <AutomationBuilder />
-  
\ No newline at end of file
diff --git a/packages/builder/src/pages/[application]/automate/index.svelte b/packages/builder/src/pages/[application]/automate/index.svelte
index 98e5b80a1..f6568417a 100644
--- a/packages/builder/src/pages/[application]/automate/index.svelte
+++ b/packages/builder/src/pages/[application]/automate/index.svelte
@@ -1,18 +1,19 @@
 <script>
   import { goto, leftover } from "@sveltech/routify"
-  import { onMount } from 'svelte'
+  import { onMount } from "svelte"
   import { automationStore } from "builderStore"
 
   onMount(async () => {
-      // navigate to first automation in list, if not already selected
-      if (
-        !$leftover &&
-        $automationStore.automations.length > 0 &&
-        (!$automationStore.selectedAutomation || !$automationStore.selectedAutomation?.automation?._id)
-      ) {
-        $goto(`../${$automationStore.automations[0]._id}`)
-      }
-    })
+    // navigate to first automation in list, if not already selected
+    if (
+      !$leftover &&
+      $automationStore.automations.length > 0 &&
+      (!$automationStore.selectedAutomation ||
+        !$automationStore.selectedAutomation?.automation?._id)
+    ) {
+      $goto(`../${$automationStore.automations[0]._id}`)
+    }
+  })
 </script>
 
 <i>Create your first automation to get started</i>
@@ -23,4 +24,4 @@
     color: var(--grey-5);
     margin-top: 2px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/[application]/data/_layout.svelte
index 0674c93c8..5a31d7db9 100644
--- a/packages/builder/src/pages/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/_layout.svelte
@@ -17,11 +17,11 @@
     },
   ]
 
-  let tab = $isActive('./datasource') ? "datasource" : "table"
+  let tab = $isActive("./datasource") ? "datasource" : "table"
 
   function selectFirstTableOrSource({ detail }) {
     const type = detail.heading.key
-    if (type === 'datasource') {
+    if (type === "datasource") {
       $goto("./datasource")
     } else {
       $goto("./table")
@@ -34,7 +34,10 @@
 <!-- routify:options index=0 -->
 <div class="root">
   <div class="nav">
-    <Switcher headings={tabs} bind:value={tab} on:change={selectFirstTableOrSource}>
+    <Switcher
+      headings={tabs}
+      bind:value={tab}
+      on:change={selectFirstTableOrSource}>
       <div class="title">
         <i
           data-cy={`new-${tab}`}
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
index e2e7ea3e4..222df8aee 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -3,9 +3,7 @@
   import { backendUiStore } from "builderStore"
 
   if ($params.query) {
-    const query = $backendUiStore.queries.find(
-      m => m._id === $params.query
-    )
+    const query = $backendUiStore.queries.find(m => m._id === $params.query)
     if (query) {
       backendUiStore.actions.queries.select(query)
     }
diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte
index 73b369ad6..dafaf14e4 100644
--- a/packages/builder/src/pages/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte
@@ -1,29 +1,30 @@
 <script>
-    import { backendUiStore } from "builderStore"
-    import { goto, leftover } from "@sveltech/routify"
-    import { onMount } from "svelte"
+  import { backendUiStore } from "builderStore"
+  import { goto, leftover } from "@sveltech/routify"
+  import { onMount } from "svelte"
 
-    onMount(async () => {
-      // navigate to first table in list, if not already selected
-      // and this is the final url (i.e. no selectedTable)
-      if (
-        !$leftover &&
-        $backendUiStore.datasources.length > 0 && !$backendUiStore.selectedDatasourceId
-      ) {
-        // this file routes as .../tables/index, so, go up one.
-        $goto(`../${$backendUiStore.datasources[0]._id}`)
-      }
-    })
-  </script>
-  
-  {#if $backendUiStore.tables.length === 0}
-    <i>Connect your first datasource to start building.</i>
-  {:else}<i>Select a datasource to edit</i>{/if}
-  
-  <style>
-    i {
-      font-size: var(--font-size-m);
-      color: var(--grey-5);
-      margin-top: 2px;
+  onMount(async () => {
+    // navigate to first table in list, if not already selected
+    // and this is the final url (i.e. no selectedTable)
+    if (
+      !$leftover &&
+      $backendUiStore.datasources.length > 0 &&
+      !$backendUiStore.selectedDatasourceId
+    ) {
+      // this file routes as .../tables/index, so, go up one.
+      $goto(`../${$backendUiStore.datasources[0]._id}`)
     }
-  </style>
\ No newline at end of file
+  })
+</script>
+
+{#if $backendUiStore.tables.length === 0}
+  <i>Connect your first datasource to start building.</i>
+{:else}<i>Select a datasource to edit</i>{/if}
+
+<style>
+  i {
+    font-size: var(--font-size-m);
+    color: var(--grey-5);
+    margin-top: 2px;
+  }
+</style>

From 4b6efc42ed3273595c7a129411f4d883733d3321 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Sun, 11 Apr 2021 12:53:39 +0100
Subject: [PATCH 12/19] v0.8.13

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 6 +++---
 packages/cli/package.json                 | 2 +-
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 8 ++++----
 packages/standard-components/package.json | 2 +-
 packages/string-templates/package.json    | 2 +-
 packages/worker/package.json              | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lerna.json b/lerna.json
index 5d71dc202..0a4705cc4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.12",
+  "version": "0.8.13",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3db29b060..7fe17a3e4 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.12",
+    "@budibase/client": "^0.8.13",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.12",
+    "@budibase/string-templates": "^0.8.13",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5c58c8056..ef4f9f2ce 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "0.8.7",
+  "version": "0.8.13",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": "src/index.js",
diff --git a/packages/client/package.json b/packages/client/package.json
index af80ac21f..02df3e630 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.12",
+    "@budibase/string-templates": "^0.8.13",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.12",
+    "@budibase/standard-components": "^0.8.13",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c6a051911..a750a5d20 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.12",
-    "@budibase/string-templates": "^0.8.12",
+    "@budibase/client": "^0.8.13",
+    "@budibase/string-templates": "^0.8.13",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.12",
+    "@budibase/standard-components": "^0.8.13",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 451db3320..830c50bb9 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,7 +35,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.12",
+  "version": "0.8.13",
   "license": "MIT",
   "gitHead": "1b95326b20d1352d36305910259228b96a683dc7",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index c5ee74f2d..9c4db8bae 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index adc219a22..6eb019bef 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From c30e70c9393be9087f41cf86b7cf27c8bbba365c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Sun, 11 Apr 2021 12:58:22 +0100
Subject: [PATCH 13/19] v0.8.14

---
 lerna.json                                |  2 +-
 packages/builder/package.json             |  6 +++---
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  4 ++--
 packages/worker/package.json              |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lerna.json b/lerna.json
index 0a4705cc4..75945feb6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.13",
+  "version": "0.8.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7fe17a3e4..3940fcb74 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.58.13",
-    "@budibase/client": "^0.8.13",
+    "@budibase/client": "^0.8.14",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.8.13",
+    "@budibase/string-templates": "^0.8.14",
     "@budibase/svelte-ag-grid": "^1.0.4",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 02df3e630..838df4167 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,13 +9,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.8.13",
+    "@budibase/string-templates": "^0.8.14",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.13",
+    "@budibase/standard-components": "^0.8.14",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
@@ -29,5 +29,5 @@
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
+  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index a750a5d20..f6c293bda 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -71,8 +71,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.8.13",
-    "@budibase/string-templates": "^0.8.13",
+    "@budibase/client": "^0.8.14",
+    "@budibase/string-templates": "^0.8.14",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -126,7 +126,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.8.13",
+    "@budibase/standard-components": "^0.8.14",
     "@jest/test-sequencer": "^24.8.0",
     "cross-env": "^7.0.3",
     "electron": "10.1.3",
@@ -138,5 +138,5 @@
     "pouchdb-adapter-memory": "^7.2.1",
     "supertest": "^4.0.2"
   },
-  "gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
+  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
 }
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 830c50bb9..d8f84ef58 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -35,9 +35,9 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.8.13",
+  "version": "0.8.14",
   "license": "MIT",
-  "gitHead": "1b95326b20d1352d36305910259228b96a683dc7",
+  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321",
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.1.0",
     "@budibase/bbui": "^1.58.13",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 9c4db8bae..433384445 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -33,5 +33,5 @@
     "rollup-plugin-terser": "^7.0.2",
     "typescript": "^4.1.3"
   },
-  "gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
+  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
 }
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6eb019bef..a84feb164 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {
@@ -34,5 +34,5 @@
     "pouchdb-all-dbs": "^1.0.2",
     "server-destroy": "^1.0.1"
   },
-  "gitHead": "1b95326b20d1352d36305910259228b96a683dc7"
+  "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321"
 }

From 46acb096005b6b0fb2f20ad3618c2ac9a23f639c Mon Sep 17 00:00:00 2001
From: Michael Drury <michael@budibase.com>
Date: Sun, 11 Apr 2021 20:24:54 +0100
Subject: [PATCH 14/19] Update README.md

Fixing codecov badge.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5ecf9d3ec..4691265f5 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@
   </a>
   <img src="https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg" alt="Code of conduct" />
   <a href="https://codecov.io/gh/Budibase/budibase">
-    <img src="https://codecov.io/gh/Budibase/budibase/branch/HEAD/graph/badge.svg?token=E8W2ZFXQOH"/>
+    <img src="https://codecov.io/gh/Budibase/budibase/graph/badge.svg?token=E8W2ZFXQOH"/>
   </a>
 </p>
 

From 185dd1c7a9e54254cffcd08211667ff6329e6533 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 12 Apr 2021 11:16:41 +0100
Subject: [PATCH 15/19] Fixing issue with 403 on schema endpoint due to change
 in middleware.

---
 packages/server/src/middleware/authorized.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/middleware/authorized.js b/packages/server/src/middleware/authorized.js
index 2a1caef2a..6d646d46f 100644
--- a/packages/server/src/middleware/authorized.js
+++ b/packages/server/src/middleware/authorized.js
@@ -13,7 +13,7 @@ const { AuthTypes } = require("../constants")
 
 const ADMIN_ROLES = [BUILTIN_ROLE_IDS.ADMIN, BUILTIN_ROLE_IDS.BUILDER]
 
-const LOCAL_PASS = new RegExp(["webhooks/trigger"].join("|"))
+const LOCAL_PASS = new RegExp(["webhooks/trigger", "webhooks/schema"].join("|"))
 
 function hasResource(ctx) {
   return ctx.resourceId != null

From 08ce2b05573e0d59352802511be897bb0bf04620 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 12 Apr 2021 11:53:37 +0100
Subject: [PATCH 16/19] Some fixes for automations, removing password
 obsfucation in create user step as not useful and making update row work with
 correct row ID.

---
 packages/server/src/automations/steps/createUser.js | 1 -
 packages/server/src/automations/steps/updateRow.js  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/server/src/automations/steps/createUser.js b/packages/server/src/automations/steps/createUser.js
index 849696710..165b66fa1 100644
--- a/packages/server/src/automations/steps/createUser.js
+++ b/packages/server/src/automations/steps/createUser.js
@@ -23,7 +23,6 @@ module.exports.definition = {
         },
         password: {
           type: "string",
-          customType: "password",
           title: "Password",
         },
         roleId: {
diff --git a/packages/server/src/automations/steps/updateRow.js b/packages/server/src/automations/steps/updateRow.js
index 3b83f961f..2c287526d 100644
--- a/packages/server/src/automations/steps/updateRow.js
+++ b/packages/server/src/automations/steps/updateRow.js
@@ -73,7 +73,7 @@ module.exports.run = async function({ inputs, appId, emitter }) {
   // have to clean up the row, remove the table from it
   const ctx = {
     params: {
-      id: inputs.rowId,
+      rowId: inputs.rowId,
     },
     request: {
       body: inputs.row,

From e2762e046db93c52f8eb29ec4e630c03b18dc545 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 12 Apr 2021 12:19:45 +0100
Subject: [PATCH 17/19] Removing test case which was no longer needed.

---
 packages/server/src/api/routes/tests/webhook.spec.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/server/src/api/routes/tests/webhook.spec.js b/packages/server/src/api/routes/tests/webhook.spec.js
index 2bf5445a0..02aa1ed8e 100644
--- a/packages/server/src/api/routes/tests/webhook.spec.js
+++ b/packages/server/src/api/routes/tests/webhook.spec.js
@@ -108,14 +108,6 @@ describe("/webhooks", () => {
         type: "object",
       })
     })
-
-    it("should apply authorization to endpoint", async () => {
-      await checkBuilderEndpoint({
-        config,
-        method: "POST",
-        url: `/api/webhooks/schema/${config.getAppId()}/${webhook._id}`,
-      })
-    })
   })
 
   describe("trigger", () => {

From 2c5a65cbb260e5ab57bc6eff4c04baa0e287b280 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 12 Apr 2021 20:11:21 +0100
Subject: [PATCH 18/19] remove merge conflict

---
 .../src/components/automation/SetupPanel/RowSelector.svelte  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index c77d6d59b..bee56045f 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,11 +1,6 @@
 <script>
-<<<<<<< HEAD
-  import { backendUiStore } from "builderStore"
-  import { Select, Label } from "@budibase/bbui"
-=======
   import { tables } from "stores/backend"
   import { Select } from "@budibase/bbui"
->>>>>>> 46acb096005b6b0fb2f20ad3618c2ac9a23f639c
   import DrawerBindableInput from "../../common/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "./AutomationBindingPanel.svelte"
 

From 2abb5d57593aaab1a5830b44fc360e01f834b839 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Apr 2021 09:20:30 +0100
Subject: [PATCH 19/19] small fixes

---
 packages/builder/src/builderStore/dataBinding.js              | 4 ++--
 .../data/datasource/[selectedDatasource]/index.svelte         | 2 +-
 .../pages/builder/[application]/data/datasource/index.svelte  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 4d57311f5..696d83932 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -5,7 +5,7 @@ import { store } from "builderStore"
 import {
   tables as tablesStore,
   queries as queriesStores,
-} from "stores/backend/"
+} from "stores/backend"
 import { makePropSafe } from "@budibase/string-templates"
 import { TableNames } from "../constants"
 
@@ -252,7 +252,7 @@ export const getSchemaForDatasource = (datasource, isForm = false) => {
   if (datasource) {
     const { type } = datasource
     if (type === "query") {
-      const queries = get(queriesStores).queries
+      const queries = get(queriesStores).list
       table = queries.find(query => query._id === datasource._id)
     } else {
       const tables = get(tablesStore).list
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
index 76bab8006..d6203212f 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -81,7 +81,7 @@
       <Spacer extraLarge />
       <div class="query-header">
         <Heading small>Queries</Heading>
-        <Button secondary on:click={() => $goto('../new')}>Add Query</Button>
+        <Button secondary on:click={() => $goto('./new')}>Add Query</Button>
       </div>
       <Spacer extraLarge />
       <div class="query-list">
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
index 073aaeb68..9bf0f1325 100644
--- a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte
@@ -4,12 +4,12 @@
   import { onMount } from "svelte"
 
   onMount(async () => {
-    // navigate to first table in list, if not already selected
+    // navigate to first datasource in list, if not already selected
     $datasources.list.length > 0 && $goto(`../${$datasources.list[0]._id}`)
   })
 </script>
 
-{#if $tables.list.length === 0}
+{#if $datasources.list.length === 0}
   <i>Connect your first datasource to start building.</i>
 {:else}
   <i>Select a datasource to edit</i>