--- a/bin/pvl.hosts-graph	Sun Apr 27 01:44:30 2014 +0300
+++ b/bin/pvl.hosts-graph	Sat Jul 26 13:42:37 2014 +0300
@@ -187,7 +187,9 @@
         for ethernet in host.ethernet.itervalues() :
             hosts_by_ethernet[ethernet] = host
 
-        if host.location :
+        if host.location and host.location_domain:
+            hosts_by_location[(host.location_domain, host.location)] = host
+        elif host.location:
             hosts_by_location[(host.domain, host.location)] = host
 
     # first graph: lldp remotes