diff --git a/ui/src/console/detail/Detail.js b/ui/src/console/detail/Detail.js
index 6a92761a..582d0503 100644
--- a/ui/src/console/detail/Detail.js
+++ b/ui/src/console/detail/Detail.js
@@ -5,7 +5,6 @@ import AccessDetail from "./access/AccessDetail";
 
 const Detail = (props) => {
     let detailComponent = <h1>{props.selection.id} ({props.selection.type})</h1>;
-    console.log("selection type", props.selection.type);
 
     switch(props.selection.type) {
         case "frontend":
diff --git a/ui/src/console/detail/environment/EnvironmentDetail.js b/ui/src/console/detail/environment/EnvironmentDetail.js
index 25526520..818a4d97 100644
--- a/ui/src/console/detail/environment/EnvironmentDetail.js
+++ b/ui/src/console/detail/environment/EnvironmentDetail.js
@@ -12,7 +12,7 @@ const EnvironmentDetail = (props) => {
     const [detail, setDetail] = useState({});
 
     useEffect(() => {
-        getEnvironmentDetail(props.selection.id)
+        getEnvironmentDetail(props.selection.envZId)
             .then(resp => {
                 setDetail(resp.data);
             });
diff --git a/ui/src/console/detail/environment/MetricsTab.js b/ui/src/console/detail/environment/MetricsTab.js
index 37e447a0..bf234580 100644
--- a/ui/src/console/detail/environment/MetricsTab.js
+++ b/ui/src/console/detail/environment/MetricsTab.js
@@ -9,15 +9,15 @@ const MetricsTab = (props) => {
 	const [metrics1, setMetrics1] = useState(buildMetrics([]));
 
 	useEffect(() => {
-		metadata.getEnvironmentMetrics(props.selection.id)
+		metadata.getEnvironmentMetrics(props.selection.envZId)
 			.then(resp => {
 				setMetrics30(buildMetrics(resp.data));
 			});
-		metadata.getEnvironmentMetrics(props.selection.id, {duration: "168h"})
+		metadata.getEnvironmentMetrics(props.selection.envZId, {duration: "168h"})
 			.then(resp => {
 				setMetrics7(buildMetrics(resp.data));
 			});
-		metadata.getEnvironmentMetrics(props.selection.id, {duration: "24h"})
+		metadata.getEnvironmentMetrics(props.selection.envZId, {duration: "24h"})
 			.then(resp => {
 				setMetrics1(buildMetrics(resp.data));
 			});
@@ -26,17 +26,17 @@ const MetricsTab = (props) => {
 	useEffect(() => {
 		let mounted = true;
 		let interval = setInterval(() => {
-			metadata.getEnvironmentMetrics(props.selection.id)
+			metadata.getEnvironmentMetrics(props.selection.envZId)
 				.then(resp => {
 					if(mounted) {
 						setMetrics30(buildMetrics(resp.data));
 					}
 				});
-			metadata.getEnvironmentMetrics(props.selection.id, {duration: "168h"})
+			metadata.getEnvironmentMetrics(props.selection.envZId, {duration: "168h"})
 				.then(resp => {
 					setMetrics7(buildMetrics(resp.data));
 				});
-			metadata.getEnvironmentMetrics(props.selection.id, {duration: "24h"})
+			metadata.getEnvironmentMetrics(props.selection.envZId, {duration: "24h"})
 				.then(resp => {
 					setMetrics1(buildMetrics(resp.data));
 				});
diff --git a/ui/src/console/detail/environment/SharesTab.js b/ui/src/console/detail/environment/SharesTab.js
index 7a297221..d47c026b 100644
--- a/ui/src/console/detail/environment/SharesTab.js
+++ b/ui/src/console/detail/environment/SharesTab.js
@@ -7,7 +7,7 @@ const SharesTab = (props) => {
     const [detail, setDetail] = useState({});
 
     useEffect(() => {
-        metadata.getEnvironmentDetail(props.selection.id)
+        metadata.getEnvironmentDetail(props.selection.envZId)
             .then(resp => {
                 setDetail(resp.data);
             });
@@ -16,7 +16,7 @@ const SharesTab = (props) => {
     useEffect(() => {
         let mounted = true;
         let interval = setInterval(() => {
-            metadata.getEnvironmentDetail(props.selection.id)
+            metadata.getEnvironmentDetail(props.selection.envZId)
                 .then(resp => {
                     if(mounted) {
                         setDetail(resp.data);
diff --git a/ui/src/console/detail/share/ShareDetail.js b/ui/src/console/detail/share/ShareDetail.js
index b942cd3e..b440db9b 100644
--- a/ui/src/console/detail/share/ShareDetail.js
+++ b/ui/src/console/detail/share/ShareDetail.js
@@ -13,7 +13,7 @@ const ShareDetail = (props) => {
     const [detail, setDetail] = useState({});
 
     useEffect(() => {
-        metadata.getShareDetail(props.selection.id)
+        metadata.getShareDetail(props.selection.shrToken)
             .then(resp => {
                 let detail = resp.data;
                 detail.envZId = props.selection.envZId;
@@ -24,7 +24,7 @@ const ShareDetail = (props) => {
     useEffect(() => {
         let mounted = true;
         let interval = setInterval(() => {
-            metadata.getShareDetail(props.selection.id)
+            metadata.getShareDetail(props.selection.shrToken)
                 .then(resp => {
                     if(mounted) {
                         let detail = resp.data;
diff --git a/ui/src/console/visualizer/graph.js b/ui/src/console/visualizer/graph.js
index cb2efb2a..3d35d7d4 100644
--- a/ui/src/console/visualizer/graph.js
+++ b/ui/src/console/visualizer/graph.js
@@ -36,7 +36,8 @@ export const mergeGraph = (oldGraph, user, accountLimited, newOverview) => {
         newOverview.forEach(env => {
             let limited = !!env.limited;
             let envNode = {
-                id: env.environment.zId,
+                id: 'env:' + env.environment.zId,
+                envZId: env.environment.zId,
                 label: env.environment.description,
                 type: "environment",
                 limited: !!env.environment.limited || accountNode.limited,
@@ -55,7 +56,8 @@ export const mergeGraph = (oldGraph, user, accountLimited, newOverview) => {
                         shrLabel = shr.backendProxyEndpoint;
                     }
                     let shrNode = {
-                        id: shr.token,
+                        id: 'shr:' + shr.token,
+                        shrToken: shr.token,
                         envZId: env.environment.zId,
                         label: shrLabel,
                         type: "share",
@@ -74,7 +76,7 @@ export const mergeGraph = (oldGraph, user, accountLimited, newOverview) => {
             if(env.frontends) {
                 env.frontends.forEach(fe => {
                    let feNode = {
-                       id: "fe:" + fe.id,
+                       id: 'ac:' + fe.id,
                        feId: fe.id,
                        target: fe.shrToken,
                        label: fe.shrToken,