diff --git a/app/helpers/application_helper/toolbar_builder.rb b/app/helpers/application_helper/toolbar_builder.rb
index 5229c43a72c..92b6c616fb1 100644
--- a/app/helpers/application_helper/toolbar_builder.rb
+++ b/app/helpers/application_helper/toolbar_builder.rb
@@ -412,7 +412,7 @@ def update_url_parms(url_parm)
 
     url_parm_hash = preprocess_url_param(url_parm)
     query_string.merge!(url_parm_hash)
-    URI::DEFAULT_PARSER.unescape("?#{query_string.to_query}")
+    URI::RFC2396_PARSER.unescape("?#{query_string.to_query}")
   end
 
   def preprocess_url_param(url_parm)
@@ -420,7 +420,7 @@ def preprocess_url_param(url_parm)
     parse_ampersand = /^&/.match(url_parm)
     url_parm = parse_questionmark.post_match if parse_questionmark.present?
     url_parm = parse_ampersand.post_match if parse_ampersand.present?
-    encoded_url = URI::DEFAULT_PARSER.escape(url_parm)
+    encoded_url = URI::RFC2396_PARSER.escape(url_parm)
     Rack::Utils.parse_query(URI("?#{encoded_url}").query)
   end