diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 607533ce0..62f1c4dcb 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -546,14 +546,14 @@
       showModal(ErrorMessageModal, { message: 'There is nothing to be shown on map' });
       return;
     }
-    openNewTab({
-      title: 'Map',
-      icon: 'img map',
-      tabComponent: 'MapTab',
-      props: {
-        selection,
+    openNewTab(
+      {
+        title: 'Map',
+        icon: 'img map',
+        tabComponent: 'MapTab',
       },
-    });
+      { editor: selection.map(x => _.omit(x, ['engine'])) }
+    );
     return;
   }
 
diff --git a/packages/web/src/elements/MapView.svelte b/packages/web/src/elements/MapView.svelte
index c6eff57a7..f03a80139 100644
--- a/packages/web/src/elements/MapView.svelte
+++ b/packages/web/src/elements/MapView.svelte
@@ -1,6 +1,5 @@
 <script lang="ts" context="module">
   export function selectionCouldBeShownOnMap(selection) {
-    console.log('selection', selection);
     if (selection.length > 0 && _.find(selection, x => isWktGeometry(x.value))) {
       return true;
     }
@@ -39,6 +38,7 @@
   let geoJson;
 
   function createColumnsTable(cells) {
+    if (cells.length == 0) return '';
     return `<table>${cells.map(cell => `<tr><td>${cell.column}</td><td>${cell.value}</td></tr>`).join('\n')}</table>`;
   }
 
@@ -164,14 +164,14 @@
       {
         text: 'Open on new tab',
         onClick: () => {
-          openNewTab({
-            title: 'Map',
-            icon: 'img map',
-            tabComponent: 'MapTab',
-            props: {
-              selection,
+          openNewTab(
+            {
+              title: 'Map',
+              icon: 'img map',
+              tabComponent: 'MapTab',
             },
-          });
+            { editor: selection.map(x => _.omit(x, ['engine'])) }
+          );
         },
       },
       {
diff --git a/packages/web/src/tabs/MapTab.svelte b/packages/web/src/tabs/MapTab.svelte
index 0c21add56..24c528797 100644
--- a/packages/web/src/tabs/MapTab.svelte
+++ b/packages/web/src/tabs/MapTab.svelte
@@ -1,8 +1,19 @@
 <script lang="ts">
-    import MapView from '../elements/MapView.svelte';
-  
-    export let selection;
-  </script>
-  
+  import MapView from '../elements/MapView.svelte';
+
+  import useEditorData from '../query/useEditorData';
+
+  export let tabid;
+  let selection;
+
+  useEditorData({
+    tabid,
+    onInitialData: value => {
+      selection = value;
+    },
+  });
+</script>
+
+{#if selection}
   <MapView {selection} />
-  
\ No newline at end of file
+{/if}