diff --git a/source/Ox.UI/js/Core/URL.js b/source/Ox.UI/js/Core/URL.js
index 90e47558..e51a3963 100644
--- a/source/Ox.UI/js/Core/URL.js
+++ b/source/Ox.UI/js/Core/URL.js
@@ -475,7 +475,7 @@ Ox.URL = function(options) {
         var obj = {};
         if (hash.query) {
             hash.query.forEach(function(condition) {
-                obj[condition.key] = condition.value;
+                obj[encodeValue(condition.key)] = encodeValue(condition.value);
             });
         }
         return hash.anchor || hash.query
@@ -722,8 +722,8 @@ Ox.URL = function(options) {
             Ox.forEach(Ox.unserialize(split[1], true), function(value, key) {
                 hash.query = hash.query || [];
                 hash.query.push({
-                    key: key,
-                    value: value
+                    key: decodeValue(key),
+                    value: decodeValue(value)
                 });
             });
         }