diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index 868e6eb1bd..02a731dd78 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -23,7 +23,8 @@
   $: automationName = stepNames?.[block.id] || block?.name || ""
   $: automationNameError = getAutomationNameError(automationName)
   $: status = updateStatus(testResult, isTrigger)
-  $: isTrigger = isTrigger || block.type === "TRIGGER"
+  $: isHeaderTrigger = isTrigger || block.type === "TRIGGER"
+
   $: {
     if (!testResult) {
       testResult = $automationStore.testResults?.steps?.filter(step =>
@@ -109,7 +110,7 @@
         </svg>
       {/if}
       <div class="iconAlign">
-        {#if isTrigger}
+        {#if isHeaderTrigger}
           <Body size="XS"><b>Trigger</b></Body>
         {:else}
           <div style="margin-left: 2px;">
@@ -138,13 +139,21 @@
     </div>
     <div class="blockTitle">
       {#if showTestStatus && testResult}
-        <div style="float: right;">
-          <StatusLight
-            positive={status?.positive}
-            yellow={status?.yellow}
-            negative={status?.negative}
-            ><Body size="XS">{status?.message}</Body></StatusLight
-          >
+        <div class="status-container">
+          <div style="float:right;">
+            <StatusLight
+              positive={status?.positive}
+              yellow={status?.yellow}
+              negative={status?.negative}
+            >
+              <Body size="XS">{status?.message}</Body>
+            </StatusLight>
+          </div>
+          <Icon
+            on:click={() => dispatch("toggle")}
+            hoverable
+            name={open ? "ChevronUp" : "ChevronDown"}
+          />
         </div>
       {/if}
       <div
@@ -155,7 +164,7 @@
         }}
       >
         {#if !showTestStatus}
-          {#if !isTrigger && !loopBlock && (block?.features?.[Features.LOOPING] || !block.features)}
+          {#if !isHeaderTrigger && !loopBlock && (block?.features?.[Features.LOOPING] || !block.features)}
             <AbsTooltip type="info" text="Add looping">
               <Icon on:click={addLooping} hoverable name="RotateCW" />
             </AbsTooltip>
@@ -164,11 +173,13 @@
             <Icon on:click={deleteStep} hoverable name="DeleteOutline" />
           </AbsTooltip>
         {/if}
-        <Icon
-          on:click={() => dispatch("toggle")}
-          hoverable
-          name={open ? "ChevronUp" : "ChevronDown"}
-        />
+        {#if !showTestStatus}
+          <Icon
+            on:click={() => dispatch("toggle")}
+            hoverable
+            name={open ? "ChevronUp" : "ChevronDown"}
+          />
+        {/if}
       </div>
       {#if automationNameError}
         <div class="error-container">
@@ -184,10 +195,17 @@
 </div>
 
 <style>
+  .status-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: var(--spacing-m);
+    /* You can also add padding or margin to adjust the spacing between the text and the chevron if needed. */
+  }
+
   .context-actions {
     display: flex;
     gap: var(--spacing-l);
-    margin-left: 10px;
     margin-bottom: var(--spacing-xs);
   }
   .center-items {
@@ -210,7 +228,6 @@
 
   .blockTitle {
     display: flex;
-    align-items: center;
   }
 
   .hide-context-actions {
@@ -222,7 +239,7 @@
     background-color: transparent;
     border: 1px solid transparent;
     font-size: var(--spectrum-alias-font-size-default);
-    width: 260px;
+    width: 230px;
     box-sizing: border-box;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index d38cda8de1..6a3b918f3d 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -197,6 +197,7 @@
       let bindingName =
         automation.stepNames?.[allSteps[bindingRank - loopBlockCount].id]
 
+      console.log(bindings)
       bindings = bindings.concat(
         outputs.map(([name, value]) => {
           let runtimeName = isLoopBlock
@@ -288,7 +289,8 @@
       value.customType !== "row" &&
       value.customType !== "code" &&
       value.customType !== "queryParams" &&
-      value.customType !== "cron"
+      value.customType !== "cron" &&
+      value.customType !== "triggerSchema"
     )
   }
 
diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index 81e969b6a3..cf16e83780 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -28,7 +28,7 @@
 </script>
 
 <div class="schema-fields">
-  <Label>Table</Label>
+  <Label>Query</Label>
   <div class="field-width">
     <Select
       on:change={onChangeQuery}
