diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index 6b3433babc..e68ab1feac 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -41,8 +41,8 @@
 </div>
 
 {#if parameters.length}
-  <div class="schema-fields">
-    {#each parameters as field}
+  {#each parameters as field}
+    <div class="schema-fields">
       <Label>{field.name}</Label>
       <div class="field-width">
         <DrawerBindableInput
@@ -56,8 +56,8 @@
           updateOnChange={false}
         />
       </div>
-    {/each}
-  </div>
+    </div>
+  {/each}
 {/if}
 
 <style>
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 21d90944e8..e4751e0f6a 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -114,33 +114,12 @@
 </div>
 {#if schemaFields.length}
   {#each schemaFields as [field, schema]}
-    <div class="schema-fields">
-      <Label>{field}</Label>
-      <div class="field-width">
-        {#if !schema.autocolumn && schema.type !== "attachment"}
-          {#if isTestModal}
-            <RowSelectorTypes
-              {isTestModal}
-              {field}
-              {schema}
-              bindings={parsedBindings}
-              {value}
-              {onChange}
-            />
-          {:else}
-            <DrawerBindableSlot
-              fillWidth
-              title={value.title}
-              panel={AutomationBindingPanel}
-              type={schema.type}
-              {schema}
-              value={value[field]}
-              on:change={e => onChange(e, field)}
-              {bindings}
-              allowJS={true}
-              updateOnChange={false}
-              drawerLeft="260px"
-            >
+    {#if !schema.autocolumn}
+      {#if schema.type !== "attachment"}
+        <div class="schema-fields">
+          <Label>{field}</Label>
+          <div class="field-width">
+            {#if isTestModal}
               <RowSelectorTypes
                 {isTestModal}
                 {field}
@@ -149,22 +128,45 @@
                 {value}
                 {onChange}
               />
-            </DrawerBindableSlot>
-          {/if}
-        {/if}
+            {:else}
+              <DrawerBindableSlot
+                fillWidth
+                title={value.title}
+                panel={AutomationBindingPanel}
+                type={schema.type}
+                {schema}
+                value={value[field]}
+                on:change={e => onChange(e, field)}
+                {bindings}
+                allowJS={true}
+                updateOnChange={false}
+                drawerLeft="260px"
+              >
+                <RowSelectorTypes
+                  {isTestModal}
+                  {field}
+                  {schema}
+                  bindings={parsedBindings}
+                  {value}
+                  {onChange}
+                />
+              </DrawerBindableSlot>
+            {/if}
 
-        {#if isUpdateRow && schema.type === "link"}
-          <div class="checkbox-field">
-            <Checkbox
-              value={meta.fields?.[field]?.clearRelationships}
-              text={"Clear relationships if empty?"}
-              size={"S"}
-              on:change={e => onChangeSetting(e, field)}
-            />
+            {#if isUpdateRow && schema.type === "link"}
+              <div class="checkbox-field">
+                <Checkbox
+                  value={meta.fields?.[field]?.clearRelationships}
+                  text={"Clear relationships if empty?"}
+                  size={"S"}
+                  on:change={e => onChangeSetting(e, field)}
+                />
+              </div>
+            {/if}
           </div>
-        {/if}
-      </div>
-    </div>
+        </div>
+      {/if}
+    {/if}
   {/each}
 {/if}
 
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 373d174541..86235297ae 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -67,6 +67,7 @@
     bind:linkedRows={value[field]}
     {schema}
     on:change={e => onChange(e, field)}
+    useLabel={false}
   />
 {:else if schema.type === "string" || schema.type === "number"}
   <svelte:component
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index d357a0a54d..839075ba89 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -7,7 +7,7 @@
 
   export let schema
   export let linkedRows = []
-
+  export let useLabel = true
   const dispatch = createEventDispatcher()
 
   let rows = []
@@ -51,7 +51,7 @@
       linkedIds = e.detail ? [e.detail] : []
       dispatch("change", linkedIds)
     }}
-    {label}
+    label={useLabel ? label : null}
     sort
   />
 {:else}