diff --git a/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java b/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
index 77f4e67295..5370fba9c8 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
@@ -25,9 +25,7 @@
 package org.alfresco.repo.web.scripts.bean;
 
 import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
-import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Locale;
@@ -45,6 +43,7 @@ import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.util.GUID;
 import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.URLEncoder;
 import org.alfresco.web.scripts.DeclarativeWebScript;
 import org.alfresco.web.scripts.Status;
 import org.alfresco.web.scripts.WebScriptException;
@@ -409,18 +408,11 @@ public class KeywordSearch extends DeclarativeWebScript
         @Override
         public String getUrl()
         {
-            try
-            {
-                return MessageFormat.format(URL, new Object[] {
-                    getNodeRef().getStoreRef().getProtocol(),
-                    getNodeRef().getStoreRef().getIdentifier(),
-                    getNodeRef().getId(),
-                    StringUtils.replace(URLEncoder.encode(getName(), "UTF-8"), "+", "%20") } );
-            }
-            catch (UnsupportedEncodingException err)
-            {
-                throw new TemplateException("Failed to encode content URL for node: " + getNodeRef(), err);
-            }
+            return MessageFormat.format(URL, new Object[] {
+                getNodeRef().getStoreRef().getProtocol(),
+                getNodeRef().getStoreRef().getIdentifier(),
+                getNodeRef().getId(),
+                URLEncoder.encode(getName()) } );
         }
     }
     
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java b/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
index e7fe1ef46c..1ff50c4846 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
@@ -24,13 +24,11 @@
  */
 package org.alfresco.web.ui.repo.component;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.util.URLEncoder;
 import org.alfresco.web.ui.common.Utils;
 
 /**
@@ -89,14 +87,7 @@ public class UIAjaxFilePicker extends BaseAjaxItemPicker
       String mimetypes = getMimetypes();
       if (mimetypes != null)
       {
-         try
-         {
-            return "mimetypes=" + URLEncoder.encode(mimetypes, "UTF-8");
-         }
-         catch (UnsupportedEncodingException e)
-         {
-            throw new AlfrescoRuntimeException("Unsupported encoding.", e);
-         }
+         return "mimetypes=" + URLEncoder.encode(mimetypes);
       }
       else
       {