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 c806fef1c3..1843e5211a 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
@@ -19,14 +19,14 @@
             "type": "<#if d.isContainer>folder<#else>document</#if>",
             "mimetype": "${d.mimetype!""}",
             "icon32": "${d.icon32}",
-            "name": "${d.name}",
+            "name": "${d.name?html}",
             "status": "<#list status as s>${s}<#if s_has_next>,</#if></#list>",
             "lockedBy": "${lockedBy}",
-            "title": "${d.properties.title!""}",
-            "description": "${d.properties.description!"&lt;None&gt;"}",
-            "createdOn": "${d.properties.created?datetime}",
+            "title": "${(d.properties.title!"")?html}",
+            "description": "${(d.properties.description!"")?html}",
+            "createdOn": "${d.properties.created?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
             "createdBy": "${d.properties.creator}",
-            "modifiedOn": "${d.properties.modified?datetime}",
+            "modifiedOn": "${d.properties.modified?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
             "modifiedBy": "${d.properties.modifier}",
             "size": "${d.size}",
             "version": "${version}",
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 8d2dfe2aec..dbe0fdc6a6 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
@@ -13,8 +13,8 @@
          </#list>
          {
             "nodeRef": "${t.nodeRef}",
-            "name": "${t.name}",
-            "description": "${t.properties.description!""}",
+            "name": "${t.name?html}",
+            "description": "${(t.properties.description!"")?html}",
             "hasChildren": ${hasChildren?string}
          }
          <#if t_has_next>,</#if>