diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js
index 60902705b..8c9ac74fa 100644
--- a/public/js/icinga/utils.js
+++ b/public/js/icinga/utils.js
@@ -133,7 +133,7 @@
 
             $.each(params, function (key, value) {
               // We overwrite existing params
-              newparams[key] = value;
+              newparams[encodeURIComponent(key)] = encodeURIComponent(value);
             });
 
             if (Object.keys(newparams).length) {
@@ -143,9 +143,9 @@
                       queryString += '&';
                   }
 
-                  queryString += encodeURIComponent(key);
+                  queryString += key;
                   if (value !== null) {
-                      queryString += '=' + encodeURIComponent(value);
+                      queryString += '=' + value;
                   }
                 });
                 result += queryString;