diff --git a/src/app/service-graph/services/graph.store.spec.ts b/src/app/service-graph/services/graph.store.spec.ts
index 27c6ccd..6d50a5a 100644
--- a/src/app/service-graph/services/graph.store.spec.ts
+++ b/src/app/service-graph/services/graph.store.spec.ts
@@ -13,6 +13,7 @@
   service: new Subject<any>(),
   tenant: new Subject<any>(),
   subscriber: new Subject<any>(),
+  tenantroot: new Subject<any>(),
   network: new Subject<any>(),
   servicedependency: new Subject<any>()
 };
diff --git a/src/app/service-graph/services/graph.store.ts b/src/app/service-graph/services/graph.store.ts
index 08ec52b..7908440 100644
--- a/src/app/service-graph/services/graph.store.ts
+++ b/src/app/service-graph/services/graph.store.ts
@@ -98,7 +98,7 @@
         }
       );
 
-    this.SubscriberSubscription = this.XosModelStore.query('Subscriber', '/core/subscribers')
+    this.SubscriberSubscription = this.XosModelStore.query('Tenantroot', '/core/tenantroots')
       .subscribe(
         (res) => {
           this.combineData(res, 'subscribers');
@@ -192,7 +192,8 @@
       targetId = this.d3Id('network', tenant.subscriber_network_id);
     }
     else if (tenant.subscriber_root_id) {
-      targetId = this.d3Id('subscriber', tenant.subscriber_root_id);
+      // FIXME understand what's the correct model for the subscriber
+      targetId = this.d3Id('tenantroot', tenant.subscriber_root_id);
     }
     return targetId;
   }