diff --git a/lib/frontapp/client.rb b/lib/frontapp/client.rb
index 1d72f93..694f1ea 100644
--- a/lib/frontapp/client.rb
+++ b/lib/frontapp/client.rb
@@ -136,15 +136,15 @@ def format_query(params)
         res << q.map do |k, v|
           case v
           when Symbol, String
-            "q[#{k}]=#{URI.encode(v)}"
+            "q[#{k}]=#{URI.encode_www_form_component(v)}"
           when Array then
-            v.map { |c| "q[#{k}][]=#{URI.encode(c.to_s)}" }.join("&")
+            v.map { |c| "q[#{k}][]=#{URI.encode_www_form_component(c.to_s)}" }.join("&")
           else
-            "q[#{k}]=#{URI.encode(v.to_s)}"
+            "q[#{k}]=#{URI.encode_www_form_component(v.to_s)}"
           end
         end
       end
-      res << params.map {|k,v| "#{k}=#{URI.encode(v.to_s)}"}
+      res << params.map {|k,v| "#{k}=#{URI.encode_www_form_component(v.to_s)}"}
       res.join("&")
     end