diff --git a/js/apps/system/aardvark/aardvark.js b/js/apps/system/aardvark/aardvark.js
index 131176f317..f70a835068 100644
--- a/js/apps/system/aardvark/aardvark.js
+++ b/js/apps/system/aardvark/aardvark.js
@@ -367,25 +367,24 @@ controller.post("/query/upload/:user", function(req, res) {
 
   queries = req.body();
   userColl = db._users.byExample({"user": user}).toArray()[0];
-  storedQueries = userColl.extra.queries;
-  queriesToSave = [];
+  queriesToSave = userColl.userData.queries || [ ];
 
   underscore.each(queries, function(newq) {
-    var toBeStored = true;
-    underscore.each(storedQueries, function(stored) {
-      if (stored.name === newq.name) {
-        toBeStored = false;
+    var found = false, i;
+    for (i = 0; i < queriesToSave.length; ++i) {
+      if (queriesToSave[i].name === newq.name) {
+        queriesToSave[i] = newq;
+        found = true;
+        break;
       }
-    });
-    if (toBeStored === true) {
+    }
+    if (! found) {
       queriesToSave.push(newq);
     }
   });
 
-  queriesToSave = queriesToSave.concat(storedQueries);
-
   var toUpdate = {
-    extra: {
+    userData: {
       queries: queriesToSave
     }
   }