--- Revision 633861623739
+++ Revision 333339666130
@@ -1,17 +1,13 @@
 diff --git a/src/couchdb/couch_httpd_rewrite.erl b/src/couchdb/couch_httpd_rewrite.erl
-index 6c3d0e3..5fb0bee 100644
+index 6c3d0e3..998f41f 100644
 --- a/src/couchdb/couch_httpd_rewrite.erl
 +++ b/src/couchdb/couch_httpd_rewrite.erl
-@@ -236,46 +236,20 @@ make_query_list([{Key, {Value}}|Rest], Bindings, Acc) ->
-     Value1 = to_json({Value}),
-     make_query_list(Rest, Bindings, [{to_binding(Key), Value1}|Acc]);
- make_query_list([{Key, Value}|Rest], Bindings, Acc) when is_binary(Value) ->
--    Value1 = replace_var(Key, Value, Bindings),
-+    Value1 = replace_var(Value, Bindings),
+@@ -239,43 +239,17 @@ make_query_list([{Key, Value}|Rest], Bindings, Acc) when is_binary(Value) ->
+     Value1 = replace_var(Key, Value, Bindings),
      make_query_list(Rest, Bindings, [{to_binding(Key), Value1}|Acc]);
  make_query_list([{Key, Value}|Rest], Bindings, Acc) when is_list(Value) ->
 -    Value1 = replace_var(Key, Value, Bindings),
-+    Value1 = to_json([replace_var(V, Bindings) || V <- Value]),
++    Value1 = to_json([replace_var(Key, V, Bindings) || V <- Value]),
      make_query_list(Rest, Bindings, [{to_binding(Key), Value1}|Acc]);
  make_query_list([{Key, Value}|Rest], Bindings, Acc) ->
      make_query_list(Rest, Bindings, [{to_binding(Key), Value}|Acc]).
@@ -48,11 +44,11 @@
 -            end
 -    end.
 -
-+replace_var(<<":", Var/binary>> = Value, Bindings) ->
++replace_var(_Key, <<":", Var/binary>> = Value, Bindings) ->
 +    get_var(Var, Bindings, Value);
-+replace_var(Value, _Bindings) when is_binary(Value) ->
++replace_var(_Key, Value, _Bindings) when is_binary(Value) ->
 +    Value;
-+replace_var(Value, _Bindings) ->
++replace_var(_Key, Value, _Bindings) ->
 +    to_json(Value).
  
  get_var(VarName, Props, Default) ->