diff --git a/server/search.js b/server/search.js
index 9148086..9c4d7e6 100644
--- a/server/search.js
+++ b/server/search.js
@@ -30,7 +30,7 @@ function normalize(values) {
 
     for (var feature in values) {
         var value = values[feature];
-        result[value] = Math.max(-1.0, Math.min(1.0, value), value);
+        result[feature] = Math.max(-1.0, Math.min(1.0, value), value);
     }
 
     return result;
@@ -171,7 +171,14 @@ function addKeyword(query, callback) {
 
         result = normalize(result);
 
-        var values = [query.keyword, result.food, result.service, result.value, result.atmosphere];
+        var values = [
+            query.keyword,
+            result.food,
+            result.service,
+            result.value,
+            result.atmosphere
+        ];
+
         connection.query('INSERT INTO keywords VALUES(?, ?, ?, ?, ?)', values, function(err) {
             callback({
                 keyword: query.keyword,