diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl
index d80a1cf930..2c46c2ff5d 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.ftl
@@ -1,5 +1,5 @@
 <#macro resultsJSON results>
-<#escape x as x?j_string>
+<#escape x as jsonUtils.encodeJSONString(x)>
 {
    "totalResults": ${results?size},
    "overallSuccess": ${overallSuccess?string},
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
index e98ffd1687..37d34f232e 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
@@ -30,7 +30,7 @@
          </#if>
          <#assign tags><#list item.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list></#assign>
          {
-            "index": <#noescape>${item_index}</#noescape>,
+            "index": ${item_index},
             "nodeRef": "${d.nodeRef}",
             "type": "<#if d.isContainer>folder<#else>document</#if>",
             "mimetype": "${d.mimetype!""}",
@@ -48,7 +48,7 @@
             "modifiedOn": "${d.properties.modified?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
             "modifiedBy": "${modifiedBy}",
             "modifiedByUser": "${modifiedByUser}",
-            "size": <#noescape>"${d.size}"</#noescape>,
+            "size": "${d.size}",
             "version": "${version}",
             "contentUrl": "api/node/content/${d.storeType}/${d.storeId}/${d.id}/${d.name?url}",
             "actionSet": "${item.actionSet}",
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.json.ftl
index 77b3ecf97f..ffeb4e3937 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.json.ftl
@@ -2,7 +2,7 @@
 {
    "treenode":
    {
-      "totalItems": <#noescape>${treenode.items?size}</#noescape>,
+      "totalItems": ${treenode.items?size},
       "items":
       [
    <#list treenode.items as t>