diff --git a/gui/ngXosViews/serviceTopology/src/js/services.js b/gui/ngXosViews/serviceTopology/src/js/services.js
index 21ca9aa..a39a1a6 100644
--- a/gui/ngXosViews/serviceTopology/src/js/services.js
+++ b/gui/ngXosViews/serviceTopology/src/js/services.js
@@ -35,9 +35,12 @@
 
     const buildLevel = (tenants, services, rootService, parentName = null) => {
 
+      console.log(rootService);
+
       const tree = {
         name: rootService.humanReadableName,
         parent: parentName,
+        service: rootService,
         children: []
       };
 
diff --git a/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js b/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js
index f7a70e5..0df7bd6 100644
--- a/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js
+++ b/gui/ngXosViews/serviceTopology/src/js/topologyCanvas.js
@@ -84,7 +84,6 @@
           nodes.forEach(function(d) {
             // position the child node horizontally
             d.y = d.depth * (($window.innerWidth - (serviceTopologyConfig.widthMargin * 2)) / maxDepth);
-            console.log(d.x);
           });
 
           // Update the nodes…
@@ -206,7 +205,7 @@
             name: d.name
           };
 
-          Slice.query({service: d.id}).$promise
+          Slice.query({service: d.service.id}).$promise
           .then(slices => {
             _this.slices = slices;
 
@@ -237,7 +236,6 @@
                 })
                 .text(() => {
                   if(slices[0]){
-                    console.log(slices[0].humanReadableName);
                     return slices[0].humanReadableName;
                   }
 
