diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
index b33b9aa8d6..4baf7e1381 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/move.post.js
@@ -53,7 +53,7 @@ function main()
 		link.save();
 **/		
 		var placeholder = createWikiPage(currentName, wiki, {
-			content: "This page has been moved [["  + args.name + "|here]]."
+			content: "This page has been moved [["  + newName + "|here]]."
 		});
 		
 	   var d = {
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.json.ftl
index d6f65e72f1..7d25b9b235 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.json.ftl
@@ -7,8 +7,8 @@
          "name" : "${page.name}",
          "editable" : "<#if page.hasPermission("Write")>true<#else>false</#if>",
          "title" : "<#if page.properties.title?exists>${page.properties.title}<#else>${page.name?replace("_", " ")}</#if>",
-         <#-- strip out any html tags and/or wiki markup -->
-         "text" : "${page.content?replace("</?[^>]+>", " ", "ir")?replace("\\[\\[(?:[a-zA-Z\\s]+\\|)?([^\\]]+)\\]\\]", "$1", "ir")?j_string}",
+         <#-- strip out any html tags -->
+         "text" : "${page.content?replace("</?[^>]+>", " ", "ir")}",
          "createdOn": "${page.properties.created?string("MMM dd yyyy, HH:mm:ss")}",
          "createdBy": "${page.properties.creator}",
          "modifiedOn": "${page.properties.modified?string("MMM dd yyyy, HH:mm:ss")}",