diff --git a/hyperglass/hyperglass.py b/hyperglass/hyperglass.py
index 4bf71ed..778c1f8 100644
--- a/hyperglass/hyperglass.py
+++ b/hyperglass/hyperglass.py
@@ -172,7 +172,7 @@ def hyperglass_main():
         logger.debug("No input specified")
         return Response(config["messages"]["no_input"], codes["danger"])
     # Return error if no location is selected
-    if lg_data["location"] not in configuration.locations():
+    if lg_data["location"] not in configuration.hostnames():
         logger.debug("No selection specified")
         return Response(config["messages"]["no_location"], codes["danger"])
     # Return error if no query type is selected
diff --git a/hyperglass/static/js/hyperglass.js b/hyperglass/static/js/hyperglass.js
index e3f85c9..f1d9cfe 100644
--- a/hyperglass/static/js/hyperglass.js
+++ b/hyperglass/static/js/hyperglass.js
@@ -122,7 +122,7 @@ $('#network').on('change', () => {
 
 function updateRouters(locations) {
   locations.forEach(function(r) {
-    $('#location').append($("<option>").attr('value', r.location).text(r.display_name))
+    $('#location').append($("<option>").attr('value', r.hostname).text(r.display_name))
   })
 }