diff --git a/packages/web/src/celldata/MapCellView.svelte b/packages/web/src/celldata/MapCellView.svelte
index 6a0d58d68..d19845e3d 100644
--- a/packages/web/src/celldata/MapCellView.svelte
+++ b/packages/web/src/celldata/MapCellView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import _ from 'lodash';
-  import MapView, { findAllObjectPaths, findLatPaths, findLonPaths } from '../elements/MapView.svelte';
+  import SelectionMapView, { findAllObjectPaths, findLatPaths, findLonPaths } from '../elements/SelectionMapView.svelte';
   import SelectField from '../forms/SelectField.svelte';
 
   export let selection;
@@ -48,7 +48,7 @@
     </div>
   {/if}
 
-  <MapView {selection} {latitudeField} {longitudeField} />
+  <SelectionMapView {selection} {latitudeField} {longitudeField} />
 </div>
 
 <style>
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index c684f85ea..de8db348d 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -333,7 +333,7 @@
   import { apiCall } from '../utility/api';
   import getElectron from '../utility/getElectron';
   import { isCtrlOrCommandKey, isMac } from '../utility/common';
-  import { selectionCouldBeShownOnMap } from '../elements/MapView.svelte';
+  import { selectionCouldBeShownOnMap } from '../elements/SelectionMapView.svelte';
   import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
   import EditCellDataModal, { shouldOpenMultilineDialog } from '../modals/EditCellDataModal.svelte';
 
diff --git a/packages/web/src/elements/MapView.svelte b/packages/web/src/elements/MapView.svelte
index 473465fff..ac91f1d0e 100644
--- a/packages/web/src/elements/MapView.svelte
+++ b/packages/web/src/elements/MapView.svelte
@@ -1,48 +1,3 @@
-<script lang="ts" context="module">
-  function findLatLonPaths(obj, attrTest, res = [], prefix = '') {
-    for (const key of Object.keys(obj)) {
-      if (attrTest(key, obj[key])) {
-        res.push(prefix + key);
-      }
-      if (_.isPlainObject(obj[key])) {
-        findLatLonPaths(obj[key], attrTest, res, prefix + key + '.');
-      }
-    }
-    return res;
-  }
-  export function findLatPaths(obj) {
-    return findLatLonPaths(obj, x => x.includes('lat'));
-  }
-  export function findLonPaths(obj) {
-    return findLatLonPaths(obj, x => x.includes('lon') || x.includes('lng'));
-  }
-  export function findAllObjectPaths(obj) {
-    return findLatLonPaths(obj, (_k, v) => v != null && !_.isNaN(Number(v)));
-  }
-
-  export function selectionCouldBeShownOnMap(selection) {
-    if (selection.length > 0 && _.find(selection, x => isWktGeometry(x.value))) {
-      return true;
-    }
-
-    if (
-      selection.length > 0 &&
-      _.find(selection, x => findLatPaths(x.rowData).length > 0 && findLonPaths(x.rowData).length > 0)
-    ) {
-      return true;
-    }
-
-    // if (
-    //   selection.find(x => x.column.toLowerCase().includes('lat')) &&
-    //   (selection.find(x => x.column.toLowerCase().includes('lon')) ||
-    //     selection.find(x => x.column.toLowerCase().includes('lng')))
-    // ) {
-    //   return true;
-    // }
-    return false;
-  }
-</script>
-
 <script lang="ts">
   import _ from 'lodash';
   import { onMount, tick } from 'svelte';
@@ -57,82 +12,19 @@
   import { getCurrentConfig } from '../stores';
   import { apiCall } from '../utility/api';
 
-  export let selection;
-
-  export let latitudeField = '';
-  export let longitudeField = '';
-
   let refContainer;
   let map;
 
-  let selectionLayers = [];
-  let geoJson;
+  let layers = [];
+  export let geoJson;
 
-  function createColumnsTable(cells) {
-    if (cells.length == 0) return '';
-    return `<table>${cells
-      .map(cell => `<tr><td>${cell.column}</td><td>${stringifyCellValue(cell.value)}</td></tr>`)
-      .join('\n')}</table>`;
-  }
-
-  function addSelectionToMap() {
+  function addObjectToMap() {
     if (!map) return;
-    if (!selection) return;
 
-    for (const selectionLayer of selectionLayers) {
-      selectionLayer.remove();
+    for (const layer of layers) {
+      layer.remove();
     }
-    selectionLayers = [];
-
-    const selectedRows = _.groupBy(selection || [], 'row');
-
-    const features = [];
-
-    for (const rowKey of _.keys(selectedRows)) {
-      const cells = selectedRows[rowKey];
-      // const lat = cells.find(x => x.column.toLowerCase().includes('lat'));
-      // const lon = cells.find(x => x.column.toLowerCase().includes('lon') || x.column.toLowerCase().includes('lng'));
-
-      const geoValues = cells.map(x => x.value).filter(isWktGeometry);
-
-      const lat = latitudeField ? Number(_.get(cells[0].rowData, latitudeField)) : NaN;
-      const lon = longitudeField ? Number(_.get(cells[0].rowData, longitudeField)) : NaN;
-
-      if (!_.isNaN(lat) && !_.isNaN(lon)) {
-        features.push({
-          type: 'Feature',
-          properties: {
-            popupContent: createColumnsTable(cells),
-          },
-          geometry: {
-            type: 'Point',
-            coordinates: [Number(lon), Number(lat)],
-          },
-        });
-      }
-
-      if (geoValues.length > 0) {
-        // parse WKT to geoJSON array
-        features.push(
-          ...geoValues.map(wellknown).map(geometry => ({
-            type: 'Feature',
-            properties: {
-              popupContent: createColumnsTable(cells.filter(x => !isWktGeometry(x.value))),
-            },
-            geometry,
-          }))
-        );
-      }
-    }
-
-    if (features.length == 0) {
-      return;
-    }
-
-    geoJson = {
-      type: 'FeatureCollection',
-      features,
-    };
+    layers = [];
 
     const geoJsonObj = leaflet
       .geoJSON(geoJson, {
@@ -166,7 +58,7 @@
       .addTo(map);
     // geoJsonObj.bindPopup('This is the Transamerica Pyramid'); //.openPopup();
     map.fitBounds(geoJsonObj.getBounds());
-    selectionLayers.push(geoJsonObj);
+    layers.push(geoJsonObj);
   }
 
   onMount(() => {
@@ -179,22 +71,12 @@
       })
       .addTo(map);
 
-    addSelectionToMap();
-    // map.fitBounds([
-    //   [50, 15],
-    //   [50.1, 15],
-    //   [50, 15.1],
-    // ]);
-
-    // const marker = leaflet.marker([50, 15]).addTo(map);
-    // <div bind:this={refContainer} class="flex1 map-container" />
+    addObjectToMap();
   });
 
   $: {
-    selection;
-    latitudeField;
-    longitudeField;
-    addSelectionToMap();
+    geoJson;
+    addObjectToMap();
   }
 
   function createMenu() {
@@ -208,7 +90,7 @@
               icon: 'img map',
               tabComponent: 'MapTab',
             },
-            { editor: selection.map(x => _.omit(x, ['engine'])) }
+            { editor: geoJson }
           );
         },
       },
diff --git a/packages/web/src/elements/SelectionMapView.svelte b/packages/web/src/elements/SelectionMapView.svelte
new file mode 100644
index 000000000..d1b6af78a
--- /dev/null
+++ b/packages/web/src/elements/SelectionMapView.svelte
@@ -0,0 +1,139 @@
+<script lang="ts" context="module">
+  function findLatLonPaths(obj, attrTest, res = [], prefix = '') {
+    for (const key of Object.keys(obj)) {
+      if (attrTest(key, obj[key])) {
+        res.push(prefix + key);
+      }
+      if (_.isPlainObject(obj[key])) {
+        findLatLonPaths(obj[key], attrTest, res, prefix + key + '.');
+      }
+    }
+    return res;
+  }
+  export function findLatPaths(obj) {
+    return findLatLonPaths(obj, x => x.includes('lat'));
+  }
+  export function findLonPaths(obj) {
+    return findLatLonPaths(obj, x => x.includes('lon') || x.includes('lng'));
+  }
+  export function findAllObjectPaths(obj) {
+    return findLatLonPaths(obj, (_k, v) => v != null && !_.isNaN(Number(v)));
+  }
+
+  export function selectionCouldBeShownOnMap(selection) {
+    if (selection.length > 0 && _.find(selection, x => isWktGeometry(x.value))) {
+      return true;
+    }
+
+    if (
+      selection.length > 0 &&
+      _.find(selection, x => findLatPaths(x.rowData).length > 0 && findLonPaths(x.rowData).length > 0)
+    ) {
+      return true;
+    }
+
+    // if (
+    //   selection.find(x => x.column.toLowerCase().includes('lat')) &&
+    //   (selection.find(x => x.column.toLowerCase().includes('lon')) ||
+    //     selection.find(x => x.column.toLowerCase().includes('lng')))
+    // ) {
+    //   return true;
+    // }
+    return false;
+  }
+</script>
+
+<script lang="ts">
+  import _ from 'lodash';
+  import { onMount, tick } from 'svelte';
+  import 'leaflet/dist/leaflet.css';
+  import leaflet from 'leaflet';
+  import wellknown from 'wellknown';
+  import { isWktGeometry, ScriptWriter, ScriptWriterJson, stringifyCellValue } from 'dbgate-tools';
+  import resizeObserver from '../utility/resizeObserver';
+  import openNewTab from '../utility/openNewTab';
+  import contextMenu from '../utility/contextMenu';
+  import { saveExportedFile, saveFileToDisk } from '../utility/exportFileTools';
+  import { getCurrentConfig } from '../stores';
+  import { apiCall } from '../utility/api';
+  import MapView from './MapView.svelte';
+
+  export let selection;
+
+  export let latitudeField = '';
+  export let longitudeField = '';
+
+  let refContainer;
+  let map;
+
+  let selectionLayers = [];
+  let geoJson;
+
+  function createColumnsTable(cells) {
+    if (cells.length == 0) return '';
+    return `<table>${cells
+      .map(cell => `<tr><td>${cell.column}</td><td>${stringifyCellValue(cell.value)}</td></tr>`)
+      .join('\n')}</table>`;
+  }
+
+  function createGeoJson() {
+    const selectedRows = _.groupBy(selection || [], 'row');
+
+    const features = [];
+
+    for (const rowKey of _.keys(selectedRows)) {
+      const cells = selectedRows[rowKey];
+      // const lat = cells.find(x => x.column.toLowerCase().includes('lat'));
+      // const lon = cells.find(x => x.column.toLowerCase().includes('lon') || x.column.toLowerCase().includes('lng'));
+
+      const geoValues = cells.map(x => x.value).filter(isWktGeometry);
+
+      const lat = latitudeField ? Number(_.get(cells[0].rowData, latitudeField)) : NaN;
+      const lon = longitudeField ? Number(_.get(cells[0].rowData, longitudeField)) : NaN;
+
+      if (!_.isNaN(lat) && !_.isNaN(lon)) {
+        features.push({
+          type: 'Feature',
+          properties: {
+            popupContent: createColumnsTable(cells),
+          },
+          geometry: {
+            type: 'Point',
+            coordinates: [Number(lon), Number(lat)],
+          },
+        });
+      }
+
+      if (geoValues.length > 0) {
+        // parse WKT to geoJSON array
+        features.push(
+          ...geoValues.map(wellknown).map(geometry => ({
+            type: 'Feature',
+            properties: {
+              popupContent: createColumnsTable(cells.filter(x => !isWktGeometry(x.value))),
+            },
+            geometry,
+          }))
+        );
+      }
+    }
+
+    if (features.length == 0) {
+      return;
+    }
+
+    geoJson = {
+      type: 'FeatureCollection',
+      features,
+    };
+  }
+
+  $: {
+    selection;
+    latitudeField;
+    longitudeField;
+    createGeoJson();
+  }
+</script>
+
+<MapView {geoJson} />
diff --git a/packages/web/src/tabs/MapTab.svelte b/packages/web/src/tabs/MapTab.svelte
index 24c528797..7a3432ac3 100644
--- a/packages/web/src/tabs/MapTab.svelte
+++ b/packages/web/src/tabs/MapTab.svelte
@@ -4,16 +4,16 @@
   import useEditorData from '../query/useEditorData';
 
   export let tabid;
-  let selection;
+  let geoJson;
 
   useEditorData({
     tabid,
     onInitialData: value => {
-      selection = value;
+      geoJson = value;
     },
   });
 </script>
 
-{#if selection}
-  <MapView {selection} />
+{#if geoJson}
+  <MapView {geoJson} />
 {/if}
diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte
index 7889c8c6b..367948296 100644
--- a/packages/web/src/widgets/CellDataWidget.svelte
+++ b/packages/web/src/widgets/CellDataWidget.svelte
@@ -80,7 +80,7 @@
   import TextCellViewNoWrap from '../celldata/TextCellViewNoWrap.svelte';
   import TextCellViewWrap from '../celldata/TextCellViewWrap.svelte';
   import ErrorInfo from '../elements/ErrorInfo.svelte';
-  import { selectionCouldBeShownOnMap } from '../elements/MapView.svelte';
+  import { selectionCouldBeShownOnMap } from '../elements/SelectionMapView.svelte';
   import SelectField from '../forms/SelectField.svelte';
   import { selectedCellsCallback } from '../stores';
   import WidgetTitle from './WidgetTitle.svelte';