diff --git a/client/application.js b/client/application.js
index 7445106..47f50f3 100644
--- a/client/application.js
+++ b/client/application.js
@@ -210,12 +210,14 @@ function onQuery() {
 }
 
 $(document).ready(function() {
-    $.getJSON('/node/hscd/keywords', function(data) {
-        for (var keyword in data) {
+    $.getJSON('/node/hscd/keywords', function(keywords) {
+        for (var i = 0; i < keywords.length; ++i) {
             $('#query').append($('<option></option>', {
-                'value': keyword,
-                'text':  keyword
+                'value': keywords[i],
+                'text':  keywords[i]
             }));
         }
+
+        $('#search').prop('disabled', false);
     });
 });
diff --git a/client/index.html b/client/index.html
index a46efa6..8d1c7e0 100644
--- a/client/index.html
+++ b/client/index.html
@@ -40,7 +40,7 @@
                     </div>
                     <div class="form-group">
                         <div class="col-md-offset-2 col-md-10">
-                            <button class="btn btn-primary" id="search" type="button">
+                            <button class="btn btn-primary" id="search" type="button" disabled="disabled">
                                 <span class="glyphicon glyphicon-search"></span> Search
                             </button>
                         </div>
@@ -100,9 +100,8 @@
         <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="bower_components/fabric/dist/fabric.min.js"></script>
 
+        <script src="application.js"></script>
         <script src="grapher.js"></script>
-        <script src="projection.js"></script>
-        <script src="data.json"></script>
 
     </body>
 </html>
diff --git a/server/package.json b/server/package.json
index c1f8fb9..64a4498 100644
--- a/server/package.json
+++ b/server/package.json
@@ -10,6 +10,7 @@
   "author": "",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "express": "~4.5.1"
+    "express": "~4.5.1",
+    "underscore": "^1.6.0"
   }
 }
diff --git a/server/server.js b/server/server.js
index 68971e4..9c02ac1 100755
--- a/server/server.js
+++ b/server/server.js
@@ -3,6 +3,7 @@
 var express  = require('express');
 var keywords = require('./db/keywords.json');
 var data     = require('./db/data.json');
+var _        = require('underscore');
 
 function main() {
     var app     = express();
@@ -10,7 +11,7 @@ function main() {
 
     router.use('/keywords', function(req, res, next) {
         console.log('Requesting keywords');
-        res.json(keywords);
+        res.json(_.keys(keywords));
     });
 
     app.use('/hscd', router);