diff --git a/src/plugins/query.js b/src/plugins/query.js
index bf5dfee8..0c990ef4 100644
--- a/src/plugins/query.js
+++ b/src/plugins/query.js
@@ -5,13 +5,16 @@
 Lawnchair.plugin((function(){        
     // 
     var interpolate = function(template, args) {
-        var parts = template.split('?').filter(function(i) { return i != ''})
-        ,   query = ''
 
-        for (var i = 0, l = parts.length; i < l; i++) {
-            query += parts[i] + args[i]    
-        }
-        return query
+        query = template.replace(/\?/g, function() {
+            var item = args.shift();
+            if(typeof item == "string") {
+                item = "'" + item + "'";
+            }
+            return item;
+        });
+
+        return query;
     }
      
     var sorter = function(p) {
@@ -44,7 +47,7 @@ Lawnchair.plugin((function(){
             // overwrite working results
             this.__results = r
             // callback / chain
-            if (args.length === 1) this.fn(this.name, last).call(this, this.__results)   
+            if (args.length) this.fn(this.name, last).call(this, this.__results)
             return this 
         },