diff --git a/lerna.json b/lerna.json
index 49a7e06982..53939d3bd6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 549ba4e815..bf47aaae86 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.0.219-alpha.7",
+    "@budibase/types": "^1.0.219-alpha.16",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 343193edaf..d569614d6b 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.219-alpha.7",
+    "@budibase/string-templates": "^1.0.219-alpha.16",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json
index 844b77666d..f1eada481f 100644
--- a/packages/builder/cypress.json
+++ b/packages/builder/cypress.json
@@ -13,7 +13,7 @@
     "HOST_IP": ""
   },
   "retries": {
-    "runMode": 0,
+    "runMode": 1,
     "openMode": 0
   }
 }
\ No newline at end of file
diff --git a/packages/builder/cypress/integration/addRadioButtons.spec.js b/packages/builder/cypress/integration/addRadioButtons.spec.js
index 402db195aa..578b519341 100644
--- a/packages/builder/cypress/integration/addRadioButtons.spec.js
+++ b/packages/builder/cypress/integration/addRadioButtons.spec.js
@@ -10,6 +10,7 @@ filterTests(['all'], () => {
 
     it("should add Radio Buttons options picker on form, add data, and confirm", () => {
         cy.navigateToFrontend()
+        cy.wait(500)
         cy.addComponent("Form", "Form")
         cy.addComponent("Form", "Options Picker").then((componentId) => {
             // Provide field setting
diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
index a8ba27f7ab..562e1e149f 100644
--- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
+++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
@@ -43,11 +43,11 @@ filterTests(["smoke", "all"], () => {
                 const uuid = () => Cypress._.random(0, 1e6)
                 const name = uuid()
                 if(i < 1){
-                  cy.createApp(name)
+                  cy.createApp(name, false)
                 } else {
                   cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
-                  cy.wait(500)
-                  cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true })
+                  cy.wait(1000)
+                  cy.get(interact.CREATE_APP_BUTTON, { timeout: 2000 }).click({ force: true })
                   cy.createAppFromScratch(name)
                 }
               }
@@ -56,7 +56,7 @@ filterTests(["smoke", "all"], () => {
         // Navigate back to the user
         cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
         cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click()
-        cy.get(interact.SPECTRUM_TABLE, { timeout: 500 }).contains("bbuser").click()
+        cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).contains("bbuser").click()
         for (let i = 0; i < 3; i++) {
           cy.get(interact.SPECTRUM_TABLE, { timeout: 3000})
             .eq(1)
@@ -65,24 +65,24 @@ filterTests(["smoke", "all"], () => {
             .find(interact.SPECTRUM_TABLE_CELL)
             .eq(0)
             .click()
-          cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 500 })
+          cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 })
             .contains("Choose an option")
             .click()
             .then(() => {
               if (i == 0) {
-                cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Admin").click({ force: true })
+                cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Admin").click({ force: true })
               }
               else if (i == 1) {
-                cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Power").click({ force: true })
+                cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Power").click({ force: true })
               }
               else if (i == 2) {
-                cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Basic").click({ force: true })
+                cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Basic").click({ force: true })
               }
-              cy.get(interact.SPECTRUM_BUTTON, { timeout: 1000 })
+              cy.get(interact.SPECTRUM_BUTTON, { timeout: 2000 })
                 .contains("Update role")
                 .click({ force: true })
             })
-            cy.reload()
+            cy.reload({ timeout: 5000 })
             cy.wait(1000)
         }
         // Confirm roles exist within Configure roles table
@@ -176,12 +176,12 @@ filterTests(["smoke", "all"], () => {
       // Add First name
       cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
         cy.wait(500)
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("bb")
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb")
       })
       // Add Last name
       cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => {
         cy.wait(500)
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("test")
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test")
       })
       cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click()
       // Reload page
diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js
index 9a08f72042..dbfce3ce63 100644
--- a/packages/builder/cypress/integration/appOverview.spec.js
+++ b/packages/builder/cypress/integration/appOverview.spec.js
@@ -6,7 +6,7 @@ filterTests(["all"], () => {
     before(() => {
       cy.login()
       cy.deleteAllApps()
-      cy.createTestApp()
+      cy.createApp("Cypress Tests")
     })
 
     it("Should be accessible from the applications list", () => {
@@ -82,13 +82,14 @@ filterTests(["all"], () => {
     })
 
     it("Should reflect the app deployment state", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       cy.get(".appTable .app-row-actions button")
         .contains("Edit")
         .eq(0)
         .click({ force: true })
 
-      cy.get(".toprightnav button.spectrum-Button")
+      cy.wait(500)
+      cy.get(".toprightnav button.spectrum-Button", { timeout: 2000 })
         .contains("Publish")
         .click({ force: true })
       cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
@@ -333,8 +334,8 @@ filterTests(["all"], () => {
           cy.wait(1000)
         })
 
-      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-      cy.get(".appTable .app-row-actions button", { timeout: 1000 })
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
+      cy.get(".appTable .app-row-actions button", { timeout: 5000 })
         .contains("Manage")
         .eq(0)
         .click({ force: true })
diff --git a/packages/builder/cypress/integration/createView.spec.js b/packages/builder/cypress/integration/createView.spec.js
index a2d09d97bf..9adc486f70 100644
--- a/packages/builder/cypress/integration/createView.spec.js
+++ b/packages/builder/cypress/integration/createView.spec.js
@@ -5,7 +5,6 @@ filterTests(['smoke', 'all'], () => {
   context("Create a View", () => {
     before(() => {
       cy.login()
-
       cy.createTestApp()
       cy.createTable("data")
       cy.addColumn("data", "group", "Text")
diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
index de959e203c..ccecfbd5df 100644
--- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js
+++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
@@ -151,7 +151,7 @@ filterTests(["all"], () => {
         cy.get("@query").its("response.body").should("not.be.empty")
         // Save query
         cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.get(".hierarchy-items-container").should("contain", queryName)
+        cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should("contain", queryName)
       })
 
       it("should switch to schema with no tables", () => {
@@ -217,24 +217,24 @@ filterTests(["all"], () => {
 
       it("should edit a query name", () => {
         // Access query
-        cy.get(".hierarchy-items-container")
+        cy.get(".hierarchy-items-container", { timeout: 2000 })
           .contains(queryName + " (1)")
           .click()
 
         // Rename query
-        cy.get(".spectrum-Form-item")
+        cy.wait(1000)
+        cy.get(".spectrum-Form-item", { timeout: 2000 })
           .eq(0)
           .within(() => {
             cy.get("input").clear().type(queryRename)
           })
 
         // Run and Save query
-        cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-        cy.wait(500)
-        cy.get(".spectrum-Button", { timeout: 500 }).contains("Save Query").click({ force: true })
-        //cy.reload()
-        //cy.wait(500)
-        cy.get(".nav-item").should("contain", queryRename)
+        cy.get(".spectrum-Button", { timeout: 2000 }).contains("Run Query").click({ force: true })
+        cy.wait(1000)
+        cy.get(".spectrum-Button", { timeout: 2000 }).contains("Save Query").click({ force: true })
+        cy.reload({ timeout: 5000 })
+        cy.get(".nav-item", { timeout: 2000 }).should("contain", queryRename)
       })
 
       it("should delete a query", () => {
@@ -251,6 +251,7 @@ filterTests(["all"], () => {
           .contains("Delete Query")
           .click({ force: true })
         // Confirm deletion
+        cy.reload({ timeout: 5000 })
         cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName)
       })
 
diff --git a/packages/builder/cypress/integration/renameAnApplication.spec.js b/packages/builder/cypress/integration/renameAnApplication.spec.js
index 370efadff2..4460750b07 100644
--- a/packages/builder/cypress/integration/renameAnApplication.spec.js
+++ b/packages/builder/cypress/integration/renameAnApplication.spec.js
@@ -12,7 +12,7 @@ filterTests(["all"], () => {
       const appName = "Cypress Tests"
       const appRename = "Cypress Renamed"
       // Rename app, Search for app, Confirm name was changed
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       renameApp(appName, appRename)
       cy.reload()
       cy.searchForApplication(appRename)
@@ -39,7 +39,7 @@ filterTests(["all"], () => {
           .click({ force: true })
       })
       // Rename app, Search for app, Confirm name was changed
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       renameApp(appName, appRename, true)
       cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1)
       cy.applicationInAppTable(appRename)
@@ -47,7 +47,7 @@ filterTests(["all"], () => {
 
     it("Should try to rename an application to have no name", () => {
       const appName = "Cypress Tests"
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       renameApp(appName, " ", false, true)
       // Close modal and confirm name has not been changed
       cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click()
@@ -57,7 +57,7 @@ filterTests(["all"], () => {
     xit("Should create two applications with the same name", () => {
       // It is not possible to have applications with the same name
       const appName = "Cypress Tests"
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 }
         .contains("Create app")
         .click({ force: true })
@@ -80,18 +80,15 @@ filterTests(["all"], () => {
       const appName = "Cypress Tests"
       const numberName = 12345
       const specialCharName = "£$%^"
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       renameApp(appName, numberName)
-      cy.reload()
       cy.applicationInAppTable(numberName)
-      cy.reload()
       renameApp(numberName, specialCharName)
       cy.get(interact.ERROR).should(
         "have.text",
         "App name must be letters, numbers and spaces only"
       )
       // Set app name back to Cypress Tests
-      cy.reload()
       renameApp(numberName, appName)
     })
 
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 16bb11ea8e..b2ab8e678c 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -134,16 +134,18 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
   const shouldCreateDefaultTable =
     typeof addDefaultTable != "boolean" ? true : addDefaultTable
 
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
   cy.wait(1000)
-  cy.get(`[data-cy="create-app-btn"]`, { timeout: 2000 }).click({ force: true })
+  cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true })
 
   // If apps already exist
   cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
     .its("body")
     .then(val => {
       if (val.length > 0) {
-        cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
+        cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({
+          force: true,
+        })
       }
     })
 
@@ -401,17 +403,19 @@ Cypress.Commands.add("createAppFromScratch", appName => {
 Cypress.Commands.add("createTable", (tableName, initialTable) => {
   if (!initialTable) {
     cy.navigateToDataSection()
-    cy.get(`[data-cy="new-table"]`).click()
+    cy.get(`[data-cy="new-table"]`, { timeout: 2000 }).click()
   }
   cy.wait(2000)
-  cy.get(".item")
+  cy.get(".item", { timeout: 2000 })
     .contains("Budibase DB")
     .click({ force: true })
     .then(() => {
-      cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+      cy.get(".spectrum-Button", { timeout: 2000 })
+        .contains("Continue")
+        .click({ force: true })
     })
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get("input", { timeout: 1000 }).first().type(tableName).blur()
+  cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => {
+    cy.get("input", { timeout: 2000 }).first().type(tableName).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create").click()
   })
   cy.contains(tableName).should("be.visible")
@@ -505,12 +509,13 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
 // DESIGN AREA
 Cypress.Commands.add("addComponent", (category, component) => {
   if (category) {
-    cy.get(`[data-cy="category-${category}"]`, { timeout: 1000 }).click({
+    cy.get(`[data-cy="category-${category}"]`, { timeout: 3000 }).click({
       force: true,
     })
   }
+  cy.wait(500)
   if (component) {
-    cy.get(`[data-cy="component-${component}"]`, { timeout: 1000 }).click({
+    cy.get(`[data-cy="component-${component}"]`, { timeout: 3000 }).click({
       force: true,
     })
   }
@@ -518,7 +523,7 @@ Cypress.Commands.add("addComponent", (category, component) => {
   cy.location().then(loc => {
     const params = loc.pathname.split("/")
     const componentId = params[params.length - 1]
-    cy.getComponent(componentId).should("exist")
+    cy.getComponent(componentId, { timeout: 3000 }).should("exist")
     return cy.wrap(componentId)
   })
 })
@@ -622,8 +627,8 @@ Cypress.Commands.add("navigateToFrontend", () => {
   // Clicks on Design tab and then the Home nav item
   cy.wait(500)
   cy.contains("Design").click()
-  cy.get(".spectrum-Search").type("/")
-  cy.get(".nav-item").contains("home").click()
+  cy.get(".spectrum-Search", { timeout: 2000 }).type("/")
+  cy.get(".nav-item", { timeout: 2000 }).contains("home").click()
 })
 
 Cypress.Commands.add("navigateToDataSection", () => {
@@ -783,7 +788,7 @@ Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => {
 
 // MISC
 Cypress.Commands.add("closeModal", () => {
-  cy.get(".spectrum-Modal").within(() => {
+  cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => {
     cy.get(".close-icon").click()
     cy.wait(1000) // Wait for modal to close
   })
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 5751c2af48..8aa08ca7d2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.219-alpha.7",
-    "@budibase/client": "^1.0.219-alpha.7",
-    "@budibase/frontend-core": "^1.0.219-alpha.7",
-    "@budibase/string-templates": "^1.0.219-alpha.7",
+    "@budibase/bbui": "^1.0.219-alpha.16",
+    "@budibase/client": "^1.0.219-alpha.16",
+    "@budibase/frontend-core": "^1.0.219-alpha.16",
+    "@budibase/string-templates": "^1.0.219-alpha.16",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1a07a4bd73..1fbb876fcb 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index f1586d6f4f..cdbf663be1 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.219-alpha.7",
-    "@budibase/frontend-core": "^1.0.219-alpha.7",
-    "@budibase/string-templates": "^1.0.219-alpha.7",
+    "@budibase/bbui": "^1.0.219-alpha.16",
+    "@budibase/frontend-core": "^1.0.219-alpha.16",
+    "@budibase/string-templates": "^1.0.219-alpha.16",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
index 80716e9459..141ce2e955 100644
--- a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
+++ b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
@@ -61,7 +61,9 @@
       clonedSchema = schema
     } else {
       allowedFields?.forEach(field => {
-        clonedSchema[field] = schema[field]
+        if (schema[field]) {
+          clonedSchema[field] = schema[field]
+        }
       })
     }
     return Object.values(clonedSchema || {})
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index f5b1d2abb5..beb3eec083 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.219-alpha.7",
+    "@budibase/bbui": "^1.0.219-alpha.16",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 6416193711..667194f038 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.219-alpha.7",
-    "@budibase/client": "^1.0.219-alpha.7",
-    "@budibase/pro": "1.0.219-alpha.7",
-    "@budibase/string-templates": "^1.0.219-alpha.7",
-    "@budibase/types": "^1.0.219-alpha.7",
+    "@budibase/backend-core": "^1.0.219-alpha.16",
+    "@budibase/client": "^1.0.219-alpha.16",
+    "@budibase/pro": "1.0.219-alpha.16",
+    "@budibase/string-templates": "^1.0.219-alpha.16",
+    "@budibase/types": "^1.0.219-alpha.16",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts
index ce6eeda7c7..8dcf570343 100644
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@@ -166,14 +166,19 @@ export async function preview(ctx: any) {
   }
 }
 
-async function execute(ctx: any, opts = { rowsOnly: false }) {
+async function execute(
+  ctx: any,
+  opts: any = { rowsOnly: false, isAutomation: false }
+) {
   const db = getAppDB()
 
   const query = await db.get(ctx.params.queryId)
   const datasource = await db.get(query.datasourceId)
 
-  const authConfigCtx: any = getAuthConfig(ctx)
-
+  let authConfigCtx: any = {}
+  if (!opts.isAutomation) {
+    authConfigCtx = getAuthConfig(ctx)
+  }
   const enrichedParameters = ctx.request.body.parameters || {}
   // make sure parameters are fully enriched with defaults
   if (query && query.parameters) {
@@ -217,8 +222,11 @@ export async function executeV1(ctx: any) {
   return execute(ctx, { rowsOnly: true })
 }
 
-export async function executeV2(ctx: any) {
-  return execute(ctx, { rowsOnly: false })
+export async function executeV2(
+  ctx: any,
+  { isAutomation }: { isAutomation?: boolean } = {}
+) {
+  return execute(ctx, { rowsOnly: false, isAutomation })
 }
 
 const removeDynamicVariables = async (queryId: any) => {
diff --git a/packages/server/src/api/routes/tests/query.spec.js b/packages/server/src/api/routes/tests/query.spec.js
index 273bdb9993..00cae3a9c9 100644
--- a/packages/server/src/api/routes/tests/query.spec.js
+++ b/packages/server/src/api/routes/tests/query.spec.js
@@ -218,7 +218,6 @@ describe("/queries", () => {
       expect(res.body.schemaFields).toEqual(["a", "b"])
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
-      datasource.config = { schema: "public" }
       expect(events.query.previewed).toBeCalledWith(datasource, query)
     })
 
diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js
index 156df504e9..30f74e17be 100644
--- a/packages/server/src/automations/steps/executeQuery.js
+++ b/packages/server/src/automations/steps/executeQuery.js
@@ -72,7 +72,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
   })
 
   try {
-    await queryController.executeV2(ctx)
+    await queryController.executeV2(ctx, { isAutomation: true })
     const { data, ...rest } = ctx.body
     return {
       response: data,
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index 2758b6f1f1..fbbc42151a 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -99,8 +99,12 @@ function generateSelectStatement(
     const fieldNames = field.split(/\./g)
     const tableName = fieldNames[0]
     const columnName = fieldNames[1]
-    if (columnName && knex.client.config.client === SqlClients.POSTGRES) {
-      const externalType = schema?.[columnName].externalType
+    if (
+      columnName &&
+      schema?.[columnName] &&
+      knex.client.config.client === SqlClients.POSTGRES
+    ) {
+      const externalType = schema[columnName].externalType
       if (externalType?.includes("money")) {
         return knex.raw(
           `"${tableName}"."${columnName}"::money::numeric as "${field}"`
diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js
index 7c94c3d25a..757fdc040b 100644
--- a/packages/server/src/threads/query.js
+++ b/packages/server/src/threads/query.js
@@ -10,6 +10,7 @@ const {
 } = require("@budibase/backend-core/auth")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const { getGlobalIDFromUserMetadataID } = require("../db/utils")
+const { cloneDeep } = require("lodash/fp")
 
 const { isSQL } = require("../integrations/utils")
 const {
@@ -41,20 +42,22 @@ class QueryRunner {
   async execute() {
     let { datasource, fields, queryVerb, transformer } = this
 
-    const Integration = integrations[datasource.source]
+    let datasourceClone = cloneDeep(datasource)
+    let fieldsClone = cloneDeep(fields)
+
+    const Integration = integrations[datasourceClone.source]
     if (!Integration) {
       throw "Integration type does not exist."
     }
 
-    if (datasource.config.authConfigs) {
-      datasource.config.authConfigs = datasource.config.authConfigs.map(
-        config => {
+    if (datasourceClone.config.authConfigs) {
+      datasourceClone.config.authConfigs =
+        datasourceClone.config.authConfigs.map(config => {
           return enrichQueryFields(config, this.ctx)
-        }
-      )
+        })
     }
 
-    const integration = new Integration(datasource.config)
+    const integration = new Integration(datasourceClone.config)
 
     // pre-query, make sure datasource variables are added to parameters
     const parameters = await this.addDatasourceVariables()
@@ -65,19 +68,19 @@ class QueryRunner {
     const enrichedContext = { ...enrichedParameters, ...this.ctx }
 
     // Parse global headers
-    if (datasource.config.defaultHeaders) {
-      datasource.config.defaultHeaders = enrichQueryFields(
-        datasource.config.defaultHeaders,
+    if (datasourceClone.config.defaultHeaders) {
+      datasourceClone.config.defaultHeaders = enrichQueryFields(
+        datasourceClone.config.defaultHeaders,
         enrichedContext
       )
     }
 
     let query
     // handle SQL injections by interpolating the variables
-    if (isSQL(datasource)) {
-      query = interpolateSQL(fields, enrichedParameters, integration)
+    if (isSQL(datasourceClone)) {
+      query = interpolateSQL(fieldsClone, enrichedParameters, integration)
     } else {
-      query = enrichQueryFields(fields, enrichedContext)
+      query = enrichQueryFields(fieldsClone, enrichedContext)
     }
 
     // Add pagination values for REST queries
@@ -116,9 +119,10 @@ class QueryRunner {
         await this.refreshOAuth2(this.ctx)
         // Attempt to refresh the access token from the provider
         this.hasRefreshedOAuth = true
+      } else {
+        this.hasRerun = true
       }
 
-      this.hasRerun = true
       await threadUtils.invalidateDynamicVariables(this.cachedVariables)
       return this.execute()
     }
@@ -187,8 +191,9 @@ class QueryRunner {
     } else {
       // In this event the user may have oAuth issues that
       // could require re-authenticating with their provider.
+      let errorMessage = resp.err.data ? resp.err.data : resp.err.toString()
       throw new Error(
-        "OAuth2 access token could not be refreshed: " + resp.err.toString()
+        "OAuth2 access token could not be refreshed: " + errorMessage
       )
     }
 
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0dc7b3e372..99c49059c3 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1100,6 +1100,7 @@
     passport-google-oauth "2.0.0"
     passport-jwt "4.0.0"
     passport-local "1.0.0"
+    passport-oauth2-refresh "^2.1.0"
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
@@ -10564,6 +10565,11 @@ passport-oauth1@1.x.x:
     passport-strategy "1.x.x"
     utils-merge "1.x.x"
 
+passport-oauth2-refresh@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4"
+  integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A==
+
 passport-oauth2@1.x.x:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b"
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 860c44ec46..96dc3aa969 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 72a0047e8e..997b95955d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b00bc42597..42e6f1fff2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219-alpha.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,10 +34,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.219-alpha.7",
-    "@budibase/pro": "1.0.219-alpha.7",
-    "@budibase/string-templates": "^1.0.219-alpha.7",
-    "@budibase/types": "^1.0.219-alpha.7",
+    "@budibase/backend-core": "^1.0.219-alpha.16",
+    "@budibase/pro": "1.0.219-alpha.16",
+    "@budibase/string-templates": "^1.0.219-alpha.16",
+    "@budibase/types": "^1.0.219-alpha.16",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 39e2807de2..9f3c4424c5 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -313,6 +313,7 @@
     passport-google-oauth "2.0.0"
     passport-jwt "4.0.0"
     passport-local "1.0.0"
+    passport-oauth2-refresh "^2.1.0"
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
@@ -4975,6 +4976,11 @@ passport-oauth1@1.x.x:
     passport-strategy "1.x.x"
     utils-merge "1.x.x"
 
+passport-oauth2-refresh@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4"
+  integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A==
+
 passport-oauth2@1.x.x:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b"
diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh
index e08f27158c..fc1d8132d9 100755
--- a/scripts/pro/release.sh
+++ b/scripts/pro/release.sh
@@ -36,10 +36,11 @@ cd ../budibase-pro
 # Install NPM credentials
 echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
 
-# Sync backend-core version in packages/pro/package.json
+# Sync budibase dependency versions in packages/pro/package.json
 # Ensures pro does not use out of date dependency
 cd packages/pro
 jq '.dependencies."@budibase/backend-core"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json
+jq '.dependencies."@budibase/types"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json
 
 # Go back to pro repo root
 cd -
@@ -91,4 +92,4 @@ cd -
 git add packages/server/package.json
 git add packages/worker/package.json
 git commit -m "Update pro version to $VERSION"
-git push
\ No newline at end of file
+git push