diff --git a/js/app/map/map.js b/js/app/map/map.js
index a84e585b..943fabc8 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -83,7 +83,7 @@ define([
             description: 'Compact system layout',
             class: 'systemCompactClass'
         },
-        mapSignatureOverlays : {
+        connectionSignatureOverlays : {
             buttonId: Util.config.menuButtonEndpointId,
             description: 'Endpoint overlay',
             onEnable: MapOverlay.showInfoSignatureOverlays,
@@ -1436,7 +1436,7 @@ define([
          */
         let showInfoSignatureOverlays = payload => new Promise(resolve => {
             Util.getLocalStore('map').getItem(payload.data.mapConfig.config.id).then(dataStore => {
-                if(dataStore && dataStore.mapSignatureOverlays){
+                if(dataStore && dataStore.connectionSignatureOverlays){
                     MapOverlay.showInfoSignatureOverlays($(payload.data.mapConfig.map.getContainer()));
                 }
                 resolve(payload);
diff --git a/js/app/map/overlay/overlay.js b/js/app/map/overlay/overlay.js
index ecfd3503..69b27ddc 100644
--- a/js/app/map/overlay/overlay.js
+++ b/js/app/map/overlay/overlay.js
@@ -288,7 +288,7 @@ define([
         let connectionsData = Util.getObjVal(mapData, 'data.connections');
 
         if(connectionsData){
-            let overlayIcon = getOverlayIcon(mapElement, options.mapSignatureOverlays.class);
+            let overlayIcon = getOverlayIcon(mapElement, options.connectionSignatureOverlays.class);
             showLoading(overlayIcon);
             updateInfoSignatureOverlays(map, connectionsData);
             hideLoading(overlayIcon);
@@ -352,7 +352,7 @@ define([
                 let mapElement = MapOverlayUtil.getMapElementFromOverlay(this);
                 let map = getMapObjectFromOverlayIcon(this);
 
-                MapUtil.storeLocalData('map', mapElement.data('id'), 'filterScopes', []);
+                Util.getLocalStore('map').setItem(`${mapElement.data('id')}.filterScopes`, []);
                 MapUtil.filterMapByScopes(map, []);
             }
         },
@@ -380,6 +380,12 @@ define([
             class: 'pf-map-overlay-compact',
             iconClass: ['fas', 'fa-fw', 'fa-compress']
         },
+        connectionSignatureOverlays: {
+            title: 'signature overlays',
+            trigger: 'active',
+            class: 'pf-map-overlay-endpoint',
+            iconClass: ['fas', 'fa-fw', 'fa-link']
+        },
         systemPopover: {
             title: 'sovereignty',
             trigger: 'hover',
@@ -416,12 +422,6 @@ define([
                 }
             }
         },
-        mapSignatureOverlays: {
-            title: 'signature overlays',
-            trigger: 'active',
-            class: 'pf-map-overlay-endpoint',
-            iconClass: ['fas', 'fa-fw', 'fa-link']
-        },
         connection: {
             title: 'WH data',
             trigger: 'hover',
diff --git a/js/app/map/util.js b/js/app/map/util.js
index cd54e743..5c5d1b52 100644
--- a/js/app/map/util.js
+++ b/js/app/map/util.js
@@ -1472,7 +1472,7 @@ define([
 
             // init endpoint overlay --------------------------------------------------------------------------
             Util.triggerMenuAction(mapElement, 'MapOption', {
-                option: 'mapSignatureOverlays',
+                option: 'connectionSignatureOverlays',
                 toggle: false,
                 skipOnEnable: true,     // skip callback -> Otherwise it would run 2 times on map create
                 skipOnDisable: true     // skip callback -> Otherwise it would run 2 times on map create
diff --git a/js/app/page.js b/js/app/page.js
index 1d749585..51c34796 100644
--- a/js/app/page.js
+++ b/js/app/page.js
@@ -406,7 +406,7 @@ define([
                     group: 'mapOptions',
                     action: 'MapOption',
                     target: 'map',
-                    data: {option: 'mapSignatureOverlays', toggle: true}
+                    data: {option: 'connectionSignatureOverlays', toggle: true}
                 },{
                     type: 'heading',
                     label: 'Help'
diff --git a/public/js/v2.0.1/app/map/map.js b/public/js/v2.0.1/app/map/map.js
index a84e585b..943fabc8 100644
--- a/public/js/v2.0.1/app/map/map.js
+++ b/public/js/v2.0.1/app/map/map.js
@@ -83,7 +83,7 @@ define([
             description: 'Compact system layout',
             class: 'systemCompactClass'
         },
-        mapSignatureOverlays : {
+        connectionSignatureOverlays : {
             buttonId: Util.config.menuButtonEndpointId,
             description: 'Endpoint overlay',
             onEnable: MapOverlay.showInfoSignatureOverlays,
@@ -1436,7 +1436,7 @@ define([
          */
         let showInfoSignatureOverlays = payload => new Promise(resolve => {
             Util.getLocalStore('map').getItem(payload.data.mapConfig.config.id).then(dataStore => {
-                if(dataStore && dataStore.mapSignatureOverlays){
+                if(dataStore && dataStore.connectionSignatureOverlays){
                     MapOverlay.showInfoSignatureOverlays($(payload.data.mapConfig.map.getContainer()));
                 }
                 resolve(payload);
diff --git a/public/js/v2.0.1/app/map/overlay/overlay.js b/public/js/v2.0.1/app/map/overlay/overlay.js
index ecfd3503..69b27ddc 100644
--- a/public/js/v2.0.1/app/map/overlay/overlay.js
+++ b/public/js/v2.0.1/app/map/overlay/overlay.js
@@ -288,7 +288,7 @@ define([
         let connectionsData = Util.getObjVal(mapData, 'data.connections');
 
         if(connectionsData){
-            let overlayIcon = getOverlayIcon(mapElement, options.mapSignatureOverlays.class);
+            let overlayIcon = getOverlayIcon(mapElement, options.connectionSignatureOverlays.class);
             showLoading(overlayIcon);
             updateInfoSignatureOverlays(map, connectionsData);
             hideLoading(overlayIcon);
@@ -352,7 +352,7 @@ define([
                 let mapElement = MapOverlayUtil.getMapElementFromOverlay(this);
                 let map = getMapObjectFromOverlayIcon(this);
 
-                MapUtil.storeLocalData('map', mapElement.data('id'), 'filterScopes', []);
+                Util.getLocalStore('map').setItem(`${mapElement.data('id')}.filterScopes`, []);
                 MapUtil.filterMapByScopes(map, []);
             }
         },
@@ -380,6 +380,12 @@ define([
             class: 'pf-map-overlay-compact',
             iconClass: ['fas', 'fa-fw', 'fa-compress']
         },
+        connectionSignatureOverlays: {
+            title: 'signature overlays',
+            trigger: 'active',
+            class: 'pf-map-overlay-endpoint',
+            iconClass: ['fas', 'fa-fw', 'fa-link']
+        },
         systemPopover: {
             title: 'sovereignty',
             trigger: 'hover',
@@ -416,12 +422,6 @@ define([
                 }
             }
         },
-        mapSignatureOverlays: {
-            title: 'signature overlays',
-            trigger: 'active',
-            class: 'pf-map-overlay-endpoint',
-            iconClass: ['fas', 'fa-fw', 'fa-link']
-        },
         connection: {
             title: 'WH data',
             trigger: 'hover',
diff --git a/public/js/v2.0.1/app/map/util.js b/public/js/v2.0.1/app/map/util.js
index cd54e743..5c5d1b52 100644
--- a/public/js/v2.0.1/app/map/util.js
+++ b/public/js/v2.0.1/app/map/util.js
@@ -1472,7 +1472,7 @@ define([
 
             // init endpoint overlay --------------------------------------------------------------------------
             Util.triggerMenuAction(mapElement, 'MapOption', {
-                option: 'mapSignatureOverlays',
+                option: 'connectionSignatureOverlays',
                 toggle: false,
                 skipOnEnable: true,     // skip callback -> Otherwise it would run 2 times on map create
                 skipOnDisable: true     // skip callback -> Otherwise it would run 2 times on map create
diff --git a/public/js/v2.0.1/app/page.js b/public/js/v2.0.1/app/page.js
index 1d749585..51c34796 100644
--- a/public/js/v2.0.1/app/page.js
+++ b/public/js/v2.0.1/app/page.js
@@ -406,7 +406,7 @@ define([
                     group: 'mapOptions',
                     action: 'MapOption',
                     target: 'map',
-                    data: {option: 'mapSignatureOverlays', toggle: true}
+                    data: {option: 'connectionSignatureOverlays', toggle: true}
                 },{
                     type: 'heading',
                     label: 'Help'