diff --git a/packages/datalib/src/runMacro.ts b/packages/datalib/src/runMacro.ts
index 19d70385c..ebd7c2983 100644
--- a/packages/datalib/src/runMacro.ts
+++ b/packages/datalib/src/runMacro.ts
@@ -214,7 +214,8 @@ export function runMacroOnChangeSet(
   macroArgs: {},
   selectedCells: MacroSelectedCell[],
   changeSet: ChangeSet,
-  display: GridDisplay
+  display: GridDisplay,
+  useRowIndexInsteaOfCondition: boolean
 ): ChangeSet {
   const errors = [];
   const compiledMacroFunc = compileMacroFunction(macro, errors);
@@ -222,7 +223,13 @@ export function runMacroOnChangeSet(
 
   let res = changeSet;
   for (const cell of selectedCells) {
-    const definition = display.getChangeSetField(cell.rowData, cell.column, undefined);
+    const definition = display.getChangeSetField(
+      cell.rowData,
+      cell.column,
+      undefined,
+      useRowIndexInsteaOfCondition ? cell.row : undefined,
+      useRowIndexInsteaOfCondition
+    );
     const macroResult = runMacroOnValue(
       compiledMacroFunc,
       macroArgs,
diff --git a/packages/web/src/datagrid/JslDataGrid.svelte b/packages/web/src/datagrid/JslDataGrid.svelte
index a0fac397d..e9f34fe9f 100644
--- a/packages/web/src/datagrid/JslDataGrid.svelte
+++ b/packages/web/src/datagrid/JslDataGrid.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { createGridCache, createGridConfig, JslGridDisplay } from 'dbgate-datalib';
+  import { createGridCache, createGridConfig, JslGridDisplay, runMacro, runMacroOnChangeSet } from 'dbgate-datalib';
   import { generateTablePairingId, processJsonDataUpdateCommands } from 'dbgate-tools';
   import { writable } from 'svelte/store';
   import JslFormView from '../formview/JslFormView.svelte';
@@ -33,6 +33,13 @@
     infoCounter += 1;
   }
 
+  function handleRunMacro(macro, params, cells) {
+    const newChangeSet = runMacroOnChangeSet(macro, params, cells, changeSetState?.value, display, true);
+    if (newChangeSet) {
+      dispatchChangeSet({ type: 'set', value: newChangeSet });
+    }
+  }
+
   $: effect = useEffect(() => onJslId(jslid));
   function onJslId(jslidVal) {
     if (jslidVal && listenInitializeFile) {
@@ -77,6 +84,10 @@
     bind:loadedRows
     isDynamicStructure={!!infoUsed?.__isDynamicStructure}
     useEvalFilters
+    showMacros={!!dispatchChangeSet}
+    expandMacros={!!dispatchChangeSet}
+    onRunMacro={handleRunMacro}
+    macroCondition={infoUsed?.__isDynamicStructure ? null : macro => macro.type == 'transformValue'}
     {changeSetState}
     {changeSetStore}
     {dispatchChangeSet}
diff --git a/packages/web/src/datagrid/JslDataGridCore.svelte b/packages/web/src/datagrid/JslDataGridCore.svelte
index d3b8a6913..edb302d29 100644
--- a/packages/web/src/datagrid/JslDataGridCore.svelte
+++ b/packages/web/src/datagrid/JslDataGridCore.svelte
@@ -67,6 +67,9 @@
   export let changeSetState;
   export let dispatchChangeSet;
 
+  export let macroPreview;
+  export let macroValues;
+  export let selectedCellsPublished = () => [];
   export const activator = createActivator('JslDataGridCore', false);
 
   export let loadedRows = [];
@@ -97,16 +100,37 @@
   }
   $: $effect;
 
-  $: grider = new ChangeSetGrider(
-    loadedRows,
-    changeSetState,
-    dispatchChangeSet,
-    display,
-    undefined,
-    undefined,
-    undefined,
-    true
-  );
+  let grider;
+
+  $: {
+    if (macroPreview) {
+      grider = new ChangeSetGrider(
+        loadedRows,
+        changeSetState,
+        dispatchChangeSet,
+        display,
+        macroPreview,
+        macroValues,
+        selectedCellsPublished(),
+        true
+      );
+    }
+  }
+
+  $: {
+    if (!macroPreview) {
+      grider = new ChangeSetGrider(
+        loadedRows,
+        changeSetState,
+        dispatchChangeSet,
+        display,
+        undefined,
+        undefined,
+        undefined,
+        true
+      );
+    }
+  }
 
   // $: grider = new RowsArrayGrider(loadedRows);
 
@@ -168,6 +192,7 @@
   bind:this={domGrid}
   {...$$props}
   bind:loadedRows
+  bind:selectedCellsPublished
   {loadDataPage}
   {dataPageAvailable}
   {loadRowCount}
diff --git a/packages/web/src/datagrid/TableDataGrid.svelte b/packages/web/src/datagrid/TableDataGrid.svelte
index 55503efd8..68f3d5d48 100644
--- a/packages/web/src/datagrid/TableDataGrid.svelte
+++ b/packages/web/src/datagrid/TableDataGrid.svelte
@@ -140,7 +140,7 @@
   };
 
   function handleRunMacro(macro, params, cells) {
-    const newChangeSet = runMacroOnChangeSet(macro, params, cells, changeSetState?.value, display);
+    const newChangeSet = runMacroOnChangeSet(macro, params, cells, changeSetState?.value, display, false);
     if (newChangeSet) {
       dispatchChangeSet({ type: 'set', value: newChangeSet });
     }
diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte
index d4e606f09..113ea1442 100644
--- a/packages/web/src/tabs/CollectionDataTab.svelte
+++ b/packages/web/src/tabs/CollectionDataTab.svelte
@@ -154,7 +154,7 @@
   }
 
   function handleRunMacro(macro, params, cells) {
-    const newChangeSet = runMacroOnChangeSet(macro, params, cells, $changeSetStore?.value, display);
+    const newChangeSet = runMacroOnChangeSet(macro, params, cells, $changeSetStore?.value, display, false);
     if (newChangeSet) {
       dispatchChangeSet({ type: 'set', value: newChangeSet });
     }
diff --git a/packages/web/src/widgets/StatusBar.svelte b/packages/web/src/widgets/StatusBar.svelte
index e020fa5ff..39d8d7e0b 100644
--- a/packages/web/src/widgets/StatusBar.svelte
+++ b/packages/web/src/widgets/StatusBar.svelte
@@ -155,7 +155,7 @@
           $selectedWidget = 'archive';
         }}
       >
-        <FontIcon icon="icon archive" />
+        <FontIcon icon="icon archive" padRight />
         {$currentArchive}
       </div>
     {/if}