diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js
index f25a4d917d..c5f1ac3a30 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js
@@ -9,18 +9,23 @@ function main()
    {
        status.setCode(status.STATUS_BAD_REQUEST, "items parameter is not present");
        return;
-   }
+   }
+   
    // convert the JSONArray object into a native JavaScript array
    var jsonItems = json.get("items"),
       numItems = jsonItems.length(),
-      item, itemKind, result;
+      item, result;
    
    for (count = 0; count < numItems; count++)
-   {
-      result = search.findNode(jsonItems.get(count));
-      if (result != null)
+   {
+      item = jsonItems.get(count);
+      if (item != "")
       {
-         results.push(result);
+         result = search.findNode(item);
+         if (result != null)
+         {
+            results.push(result);
+         }
       }
    }
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml
deleted file mode 100644
index 2c2d5c0536..0000000000
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<webscript>
-  <shortname>PickerQuery</shortname>
-  <description>Service to return items to display in the object finder</description>
-  <url>/api/forms/picker/query</url>
-  <format default="json"/>
-  <authentication>user</authentication>
-  <transaction>required</transaction>
-  <lifecycle>internal</lifecycle>
-</webscript>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js
deleted file mode 100644
index 1435997020..0000000000
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function main()
-{
-    // Extract args
-    var type = args['type'];
-    var filter = args['filter'];
-    var maxResults = args['maxResults'];
-    
-    if (type === null)
-    {
-        type = "cm:content";
-    }
-    
-    if (maxResults === null)
-    {
-        maxResults = 100;
-    }
-   
-    if (logger.isLoggingEnabled())
-    {
-        logger.log("type = " + type);
-        logger.log("filter = " + filter);
-        logger.log("maxResults = " + maxResults);
-    }
-
-    var results = [];
-    
-    // execute a lucene query using the type parameter
-    var query = "+TYPE:\"" + type + "\"";
-    if (filter !== null)
-    {
-        query += " AND +@\\{http\\://www.alfresco.org/model/content/1.0\\}name:\"*" + filter + "*\"";
-    }
-    
-    results = search.luceneSearch(query);
-    
-    if (logger.isLoggingEnabled())
-    {
-        logger.log("result count = " + results.length);
-    }
-    
-    if (results.length > maxResults)
-    {
-        results = results.slice(0, maxResults);
-        if (logger.isLoggingEnabled())
-        {
-            logger.log("Restricted results size to " + maxResults);
-        }
-    }
-    
-    model.results = results;
-}
-
-main();
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl
deleted file mode 100644
index 723a0328f9..0000000000
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-<#import "pickerresults.lib.ftl" as pickerResultsLib />
-<@pickerResultsLib.pickerResultsJSON results=results />
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl
deleted file mode 100644
index 44d3a7b50c..0000000000
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl
+++ /dev/null
@@ -1,19 +0,0 @@
-<#macro pickerQueryJSON results>
-    <#escape x as jsonUtils.encodeJSONString(x)>
-{
-    "data" :
-    {
-        "items" : 
-        [
-            <#list results as row>
-            {
-                "name" : "${row.properties.name}",
-                "description" : "${row.displayPath}",
-                "nodeRef" : "${row.nodeRef}"
-            }<#if row_has_next>,</#if>
-            </#list>
-        ]
-    }
-}
-	</#escape>
-</#macro>
\ No newline at end of file