diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js
index 50b674b1..6b10f8f3 100644
--- a/src/c3nav/site/static/site/js/c3nav.js
+++ b/src/c3nav/site/static/site/js/c3nav.js
@@ -2,13 +2,13 @@ c3nav = {
     init: function() {
         c3nav._typeahead_locations = new Bloodhound({
             datumTokenizer: function(data) {
-                var result = [data.name]
+                var result = [data.id]
                 result = result.concat(data.title.split(' '));
                 return result
             },
             queryTokenizer: Bloodhound.tokenizers.whitespace,
             identify: function(data) {
-                return data.name;
+                return data.id;
             },
             prefetch: {
                 url: '/api/locations/',
@@ -37,7 +37,7 @@ c3nav = {
     _locationselect_reset: function(e) {
         e.preventDefault();
         var locationselect = $(this).closest('.locationselect');
-        locationselect.find('.name-field').val('');
+        locationselect.find('.id-field').val('');
         locationselect.removeClass('selected').find('.tt-input').focus().keyup().removeData('enter_item');
         c3nav.update_history_state();
     },
@@ -66,7 +66,7 @@ c3nav = {
         var selected = locationselect.find('.locationselect-selected');
         selected.find('.title').text(item.title);
         selected.find('.subtitle').text(item.subtitle);
-        selected.find('.name-field').val(item.name);
+        selected.find('.id-field').val(item.id);
         e.target.blur();
         c3nav.update_history_state();
 
diff --git a/src/c3nav/site/templates/site/fragment_location.html b/src/c3nav/site/templates/site/fragment_location.html
index b4d47743..8181bbd3 100644
--- a/src/c3nav/site/templates/site/fragment_location.html
+++ b/src/c3nav/site/templates/site/fragment_location.html
@@ -3,7 +3,7 @@
     <label for="{ name }}_input">{{ heading }}</label>
     <div class="locationselect {% if location %} selected{% endif %}">
         <div class="locationselect-input">
-            <input type="text" class="form-control input-lg" id="{ name }}_input" name="{{ name }}_search" placeholder="{% trans 'Search any Location…' %}">
+            <input type="text" class="form-control input-lg" id="{{ name }}_input" name="{{ name }}_search" placeholder="{% trans 'Search any Location…' %}">
         </div>
         <div class="locationselect-selected">
             <div class="location form-control input-lg">
@@ -13,7 +13,7 @@
             <div class="icons">
                 <a href="" class="reset"></a>
             </div>
-            <input type="hidden" name="{{ name }}" value="{{ location.name }}" class="name-field">
+            <input type="hidden" name="{{ name }}" value="{{ location.location_id }}" class="id-field">
         </div>
     </div>
 </div>