diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl
index a090ce1177..6c949c2688 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl
@@ -49,7 +49,14 @@
 		"totalReplyCount": ${postData.totalReplyCount?c},
 		<#if postData.lastReply??>
 			"lastReplyOn": "${postData.lastReply.properties.created?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+			<#if postData.lastReplyBy??>
 			<@renderPerson person=postData.lastReplyBy fieldName="lastReplyBy" />
+         <#else>
+         "lastReplyBy":
+         {
+            "username": ""
+         },
+         </#if>
 		</#if>
 		"tags": [<#list postData.tags as x>"${x}"<#if x_has_next>, </#if></#list>],
 	</#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/datalists/evaluator.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/datalists/evaluator.lib.js
index ebe937f571..20b1915a52 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/datalists/evaluator.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/datalists/evaluator.lib.js
@@ -123,13 +123,14 @@ var Evaluator =
          objData.displayValue = obj.displayPath.substring(companyhome.name.length() + 1);
          objData.metadata = "container";
       }
-      else if (type == "cm:cmobject" || type == "cm:content")
+      else if (type.indexOf(":") > 0 && node.isSubType("cm:cmobject"))
       {
          obj = Evaluator.getContentObject(value);
          if (obj == null)
          {
             return false;
          }
+         objData.type = "subtype";
          objData.displayValue = obj.properties["cm:name"];
          objData.metadata = obj.isContainer ? "container" : "document";
       }
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl
index 9c9112bcbd..180e9b7189 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl
@@ -36,7 +36,7 @@
    "linkedNodeRef": "${item.linkedNode.nodeRef?string}",
 </#if>
    "fileName": "<#if item.linkedNode??>${item.linkedNode.name}<#else>${node.name}</#if>",
-   "displayName": "<#if item.linkedNode??>${item.linkedNode.name}<#else>${node.name?replace(workingCopyLabel, "")}</#if>",
+   "displayName": "<#if item.linkedNode??>${item.linkedNode.name}<#elseif node.hasAspect("cm:workingcopy")>${node.name?replace(workingCopyLabel, "")}<#else>${node.name}</#if>",
    "status": "<#list item.status?keys as s><#if item.status[s]?is_boolean && item.status[s] == true>${s}<#if s_has_next>,</#if></#if></#list>",
    "title": "${node.properties.title!""}",
    "description": "${node.properties.description!""}",
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl
index 5e16ccb76a..378083b7a1 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.json.ftl
@@ -26,7 +26,7 @@
       "name": "${record.name}",
       "version": "${record.versionLabel}",
       "versionId": "${record.id}",
-      "date": "${record.createdDate?datetime?string("dd MMMM yyyy HH:mm")}",
+      "date": "${record.createdDate?datetime?string("yyyy-mm-dd'T'HH:MM:ss")}",
       "author": "${record.creator}"     
    }<#if record_has_next>,</#if>
       </#list> 
diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java
index 8e0eacdbf2..5c86d5bf58 100644
--- a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java
@@ -68,8 +68,8 @@ public class DictionaryRestApiTest extends BaseWebScriptTest
 	private void validateChildAssociation(JSONObject result) throws Exception
 	{
 		assertEquals("wca:formworkflowdefaults", result.get("name"));
-		assertEquals("", result.get("title"));
-		assertEquals("", result.get("description"));
+		assertEquals("Form Workflow Defaults", result.get("title"));
+		assertEquals("Form Workflow Defaults", result.get("description"));
 		assertEquals(true, result.get("isChildAssociation"));
 		assertEquals(false, result.get("protected"));
 		
@@ -87,8 +87,8 @@ public class DictionaryRestApiTest extends BaseWebScriptTest
 	private void validateAssociation(JSONObject result) throws Exception
 	{
 		assertEquals("wca:renderingenginetemplates", result.get("name"));
-		assertEquals("Form Data Renderers", result.get("title"));
-		assertEquals("", result.get("description"));
+		assertEquals("Rendering Engine Templates", result.get("title"));
+		assertEquals("Rendering Engine Templates", result.get("description"));
 		assertEquals(false, result.get("isChildAssociation"));
 		assertEquals(false, result.get("protected"));