diff --git a/packages/@sparrow-workspaces/src/components/tabular-input/LazyElement.svelte b/packages/@sparrow-workspaces/src/components/tabular-input/LazyElement.svelte
index eebc0b8f0..09e3e9d8b 100644
--- a/packages/@sparrow-workspaces/src/components/tabular-input/LazyElement.svelte
+++ b/packages/@sparrow-workspaces/src/components/tabular-input/LazyElement.svelte
@@ -47,7 +47,11 @@
   use:inview={options}
   on:inview_change={handleChange}
   class="pair-data-row d-flex align-items-center w-100 {customClass}"
-  style="padding-right:1rem; padding-left: 4px;"
+  style="padding-right: {dynamicExpression &&
+  isCheckBoxEditable &&
+  pairs.length - 1 === index
+    ? '2.7rem'
+    : '1rem'}; padding-left: 4px;"
 >
   {#if isInView}
     <!-- <div class="button-container">
@@ -222,4 +226,4 @@
   .diff-row.diff-deleted {
     background-color: var(--bg-ds-danger-800) !important;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/@sparrow-workspaces/src/components/tabular-input/LazyElementFormData.svelte b/packages/@sparrow-workspaces/src/components/tabular-input/LazyElementFormData.svelte
index 96a87161e..dca95e8b4 100644
--- a/packages/@sparrow-workspaces/src/components/tabular-input/LazyElementFormData.svelte
+++ b/packages/@sparrow-workspaces/src/components/tabular-input/LazyElementFormData.svelte
@@ -122,7 +122,7 @@
   >
     {#if pairs.length - 1 != index}
       {#if isInputBoxEditable}
-        {#if dynamicExpression && element.type === "text"}
+        {#if dynamicExpression && element.type !== "file"}
           <Tooltip
             title="Insert dynamic"
             placement="bottom-center"
@@ -155,12 +155,10 @@
         >
           <button
             class="button-container d-flex align-items-center justify-content-center border-0
-                {isInputBoxEditable &&
-            element.type == 'text' &&
-            element.value == ''
+          {isInputBoxEditable && element.type !== 'file' && element.value === ''
               ? 'opacity-1'
               : 'opacity-0 pe-none'}"
-            style="width:16px; height:16px; padding:2px; background:transparent;"
+            style="width: 16px; height: 16px; padding: 2px; background: transparent;"
             on:click={() => uploadFormFile(index)}
           >
             <AttachRegular size="16px" color="var(--icon-ds-neutral-100)" />
diff --git a/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/components/function-options/FunctionsOptions.svelte b/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/components/function-options/FunctionsOptions.svelte
index 2958254ee..01d84f8d2 100644
--- a/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/components/function-options/FunctionsOptions.svelte
+++ b/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/components/function-options/FunctionsOptions.svelte
@@ -4,6 +4,7 @@
   import { FunctionOptionData } from "../../utils";
 
   export let expression: string;
+  export let cursorPosition: number | null;
   let data = FunctionOptionData;
   let hoveredFunctionType: string | null = null;
   let searchFunction = "";
@@ -16,7 +17,17 @@
     : data;
 
   const handleFunctionType = (functionItem: any) => {
-    if (expression.endsWith(".")) {
+    if (
+      cursorPosition !== null &&
+      expression !== null &&
+      cursorPosition < expression.length
+    ) {
+      expression =
+        expression.slice(0, cursorPosition) +
+        functionItem.type +
+        expression.slice(cursorPosition);
+      return;
+    } else if (expression.endsWith(".")) {
       expression += functionItem.type;
     } else {
       expression += "." + functionItem.type;
diff --git a/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/layout/TestflowDynamicExpression.svelte b/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/layout/TestflowDynamicExpression.svelte
index 354f44908..f444fa886 100644
--- a/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/layout/TestflowDynamicExpression.svelte
+++ b/packages/@sparrow-workspaces/src/features/testflow-dynamic-expressions/layout/TestflowDynamicExpression.svelte
@@ -17,6 +17,7 @@
   export let selectedBlock;
 
   export let onPreviewExpression;
+  export let dynamicExpressionPath: string = "";
 
   let currentTabId: TFDynamicExpressionTabsEnum =
     TFDynamicExpressionTabsEnum.DYNAMICCONTENT;
@@ -62,10 +63,19 @@
   $: currentOpenItem = $isDynamicExpressionContent.find(
     (item) => item.isCurrentOpen,
   );
+  $: {
+    if (
+      dynamicExpressionPath === "raw" ||
+      dynamicExpressionPath === "urlencoded" ||
+      dynamicExpressionPath === "formdata"
+    ) {
+      dynamicExpressionPath = "body" + " > " + dynamicExpressionPath;
+    }
+  }
   let cursorPosition: number | null = 0;
 </script>
 
-<div class="d-flex justify-content-between" style="gap: 12px;">
+<div class="d-flex justify-content-between" style="gap: 12px; margin-top:16px;">
   <div class="w-50">
     <ExpressionEditor
       bind:expression
@@ -99,7 +109,7 @@
               bind:cursorPosition
             />
           {:else if currentTabId === TFDynamicExpressionTabsEnum.FUNCTIONS}
-            <FunctionsOptions bind:expression />
+            <FunctionsOptions bind:expression bind:cursorPosition />
           {/if}
         {/key}
       </div>
@@ -111,10 +121,9 @@
   style="margin-top: 24px;"
 >
   <div>
-    <!-- <p style="margin: 0px;">
-      {currentOpenItem?.blockName} > {currentOpenItem?.method} > {currentOpenItem?.requestType}
-      > {currentOpenItem?.key}
-    </p> -->
+    <p style="margin: 0px;" class="dynamic-path-title">
+      Location: {selectedBlock?.data?.blockName} > {dynamicExpressionPath}
+    </p>
   </div>
   <div>
     <Button
@@ -136,4 +145,12 @@
     border-radius: 4px;
     /* height: "440px"; */
   }
+  .dynamic-path-title {
+    font-family: "Inter", sans-serif;
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 1.5;
+    letter-spacing: 0px;
+    color: #82858a;
+  }
 </style>
diff --git a/packages/@sparrow-workspaces/src/features/testflow-explorer/layout/TestflowExplorer.svelte b/packages/@sparrow-workspaces/src/features/testflow-explorer/layout/TestflowExplorer.svelte
index 167e37eb9..754a1979c 100644
--- a/packages/@sparrow-workspaces/src/features/testflow-explorer/layout/TestflowExplorer.svelte
+++ b/packages/@sparrow-workspaces/src/features/testflow-explorer/layout/TestflowExplorer.svelte
@@ -376,10 +376,12 @@
 
   let dynamicExpressionEditorContent = "";
   let dynamicExpressionModal = {};
+  let dynamicExpressionPath: string = "";
   let handleOpenCurrentDynamicExpression = (obj) => {
     dynamicExpressionModal = {};
     dynamicExpressionModal = obj;
     dynamicExpressionEditorContent = obj?.source?.content?.slice(4, -4) || "";
+    dynamicExpressionPath = obj?.type;
     isDynamicExpressionModalOpen = true;
   };
 
@@ -1431,6 +1433,7 @@
     {selectedBlock}
     {environmentVariables}
     {onPreviewExpression}
+    {dynamicExpressionPath}
   />
 </Modal>