diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ConfigModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ConfigModal.svelte
deleted file mode 100644
index ec249d015f..0000000000
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ConfigModal.svelte
+++ /dev/null
@@ -1,25 +0,0 @@
-<script>
-  import { automationStore } from "builderStore"
-
-  import { ModalContent, Toggle } from "@budibase/bbui"
-
-  $: rowControl = $automationStore.selectedAutomation.automation.rowControl
-  async function toggleFieldControl(evt) {
-    await automationStore.actions.toggleFieldControl(evt.detail)
-    await automationStore.actions.save(
-      $automationStore.selectedAutomation?.automation
-    )
-  }
-</script>
-
-<ModalContent
-  title="Automation Configuration"
-  showConfirmButton={false}
-  showCancelButton={false}
->
-  <Toggle
-    bind:value={rowControl}
-    on:change={toggleFieldControl}
-    text="Row Control"
-  />
-</ModalContent>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index 8ee3d3d9bd..ea4ddfb61d 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -14,12 +14,10 @@
     Toggle,
     Tooltip,
   } from "@budibase/bbui"
-  import ConfigModal from "./ConfigModal.svelte"
 
   export let automation
   export let onSelect
 
-  let configModal
   let testDataModal
   let blocks
   let confirmDeleteDialog
@@ -121,10 +119,6 @@
   <Modal bind:this={testDataModal} width="30%">
     <TestDataModal {testAutomation} />
   </Modal>
-
-  <Modal bind:this={configModal}>
-    <ConfigModal />
-  </Modal>
 </div>
 
 <style>
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 5765684be6..4450468ae5 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -98,7 +98,7 @@
       {#if !schema.autocolumn}
         {#if schema.type !== "attachment"}
           {#if $automationStore.selectedAutomation.automation.testData}
-            {#if $automationStore.selectedAutomation.automation.rowControl}
+            {#if !$automationStore.selectedAutomation.automation.rowControl}
               <RowSelectorTypes
                 {field}
                 {schema}
@@ -115,10 +115,10 @@
                 type={value.customType}
                 on:change={e => onChange(e, field, schema.type)}
                 {bindings}
-                allowJS={true}
+                allowJS={false}
               />
             {/if}
-          {:else if $automationStore.selectedAutomation.automation.rowControl}
+          {:else if !$automationStore.selectedAutomation.automation.rowControl}
             <RowSelectorTypes {field} {schema} {bindings} {value} {onChange} />
           {:else}
             <DrawerBindableInput
@@ -130,7 +130,7 @@
               type="string"
               {bindings}
               fillWidth={true}
-              allowJS={true}
+              allowJS={false}
             />
           {/if}
         {/if}
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 2a51e8d200..8b6318f9e0 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -59,6 +59,6 @@
     type="string"
     {bindings}
     fillWidth={true}
-    allowJS={true}
+    allowJS={false}
   />
 {/if}
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index ee0169f9e7..554220ed1a 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -26,7 +26,7 @@
   export let value = ""
   export let valid
   export let allowJS = false
-
+  $: console.log(value)
   let helpers = handlebarsCompletions()
   let getCaretPosition
   let search = ""