diff --git a/lerna.json b/lerna.json
index 3ff2e1befa..791c46039a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.181",
+  "version": "1.0.183",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c4749f8b4e..cec01edfd2 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/backend-core/src/security/sessions.js b/packages/backend-core/src/security/sessions.js
index 40a96d06e7..4e6899c248 100644
--- a/packages/backend-core/src/security/sessions.js
+++ b/packages/backend-core/src/security/sessions.js
@@ -80,6 +80,7 @@ exports.getSession = async (userId, sessionId) => {
     return client.get(makeSessionID(userId, sessionId))
   } catch (err) {
     // if can't get session don't error, just don't return anything
+    console.error(err)
     return null
   }
 }
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 880252b384..74cb2c522d 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.181",
+  "version": "1.0.183",
   "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.181",
+    "@budibase/string-templates": "^1.0.183",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index ba3ba0a490..ff96a05455 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.181",
-    "@budibase/client": "^1.0.181",
-    "@budibase/frontend-core": "^1.0.181",
-    "@budibase/string-templates": "^1.0.181",
+    "@budibase/bbui": "^1.0.183",
+    "@budibase/client": "^1.0.183",
+    "@budibase/frontend-core": "^1.0.183",
+    "@budibase/string-templates": "^1.0.183",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 532e0ff068..7b33cc191b 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -28,7 +28,6 @@
   let blockComplete
   let showLooping = false
 
-  $: rowControl = $automationStore.selectedAutomation.automation.rowControl
   $: showBindingPicker =
     block.stepId === "CREATE_ROW" || block.stepId === "UPDATE_ROW"
 
@@ -256,7 +255,7 @@
                   on:change={toggleFieldControl}
                   defaultValue="Use values"
                   autoWidth
-                  value={rowControl ? "Use bindings" : "Use values"}
+                  value={block.rowControl ? "Use bindings" : "Use values"}
                   options={["Use values", "Use bindings"]}
                   placeholder={null}
                 />
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d495afe900..2cc49c54d7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 4190d7f076..16490cace4 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3007,6 +3007,7 @@
     "illegalChildren": ["section"],
     "hasChildren": true,
     "showEmptyState": false,
+    "info": "Row selection is only compatible with internal or SQL tables", 
     "settings": [
       {
         "type": "dataProvider",
@@ -3295,6 +3296,7 @@
       {
         "section": true,
         "name": "Table",
+        "info": "Row selection is only compatible with internal or SQL tables",
         "settings": [
           {
             "type": "number",
diff --git a/packages/client/package.json b/packages/client/package.json
index 698c0d6a3e..bb27b25af7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "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.181",
-    "@budibase/frontend-core": "^1.0.181",
-    "@budibase/string-templates": "^1.0.181",
+    "@budibase/bbui": "^1.0.183",
+    "@budibase/frontend-core": "^1.0.183",
+    "@budibase/string-templates": "^1.0.183",
     "@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/table/Table.svelte b/packages/client/src/components/app/table/Table.svelte
index e8dcd30929..9346b3ca59 100644
--- a/packages/client/src/components/app/table/Table.svelte
+++ b/packages/client/src/components/app/table/Table.svelte
@@ -39,6 +39,8 @@
     dataProvider?.id,
     ActionTypes.SetDataProviderSorting
   )
+  $: table = dataProvider?.datasource?.type === "table"
+
   $: {
     rowSelectionStore.actions.updateSelection(
       $component.id,
@@ -142,7 +144,7 @@
     {quiet}
     {compact}
     {customRenderers}
-    allowSelectRows={!!allowSelectRows}
+    allowSelectRows={allowSelectRows && table}
     bind:selectedRows
     allowEditRows={false}
     allowEditColumns={false}
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 8acb09f43a..21b96e4078 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "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.181",
+    "@budibase/bbui": "^1.0.183",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index f35919d7bf..6242ce2bd1 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.181",
+  "version": "1.0.183",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.181",
-    "@budibase/client": "^1.0.181",
-    "@budibase/pro": "1.0.181",
-    "@budibase/string-templates": "^1.0.181",
+    "@budibase/backend-core": "^1.0.183",
+    "@budibase/client": "^1.0.183",
+    "@budibase/pro": "1.0.183",
+    "@budibase/string-templates": "^1.0.183",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index 4ca490affd..7c5c96fc39 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -219,7 +219,7 @@ class Orchestrator {
           }
           if (
             index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
-            index === loopStep.inputs.iterations
+            index === parseInt(loopStep.inputs.iterations)
           ) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.MAX_ITERATIONS,
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 750c62e48a..ba5d0cd221 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 09a8711e15..4d6a01727a 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.181",
+  "version": "1.0.183",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.181",
-    "@budibase/pro": "1.0.181",
-    "@budibase/string-templates": "^1.0.181",
+    "@budibase/backend-core": "^1.0.183",
+    "@budibase/pro": "1.0.183",
+    "@budibase/string-templates": "^1.0.183",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",