diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js
index 4827472644..8c143ddee4 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/lib/wiki.lib.js
@@ -48,6 +48,9 @@ function createWikiPage(name, folder, options)
 			page.content = options.content;
 		}
 	}
+	// Initialise tags to empty array
+	page.tags = [];
+	
 	// TODO: sort out appropriate permission(s)
 	page.save();	
 	return page;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js
index bb47be9e97..c281a3415c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/page.get.js
@@ -74,15 +74,11 @@ function main()
 			logger.log(e);
 		}
     }
-
-/**
-	if (page.type == "{http://www.alfresco.org/model/content/1.0}link")
-	{
-		page = search.findNode(page.properties["cm:destination"].nodeRef);
-	}
-**/
-	return page;
+    
+	return {
+	  "page": page,
+	  "tags": page.tags 
+	};
 }
 
-var page = main();
-model.page = page;
+model.result = main();
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 6ca43d828d..124b213da1 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
@@ -1,8 +1,14 @@
 {
-<#if page?exists>
+<#if result?exists>
+<#assign page = result.page>
    "title" : "<#if page.properties.title?exists>${page.properties.title}<#else>${page.name?replace("_", " ")}</#if>",
    "pagetext" : '${page.content?js_string}',
-   "editable" : '<#if page.hasPermission("Write")>true<#else>false</#if>'
+   "editable" : '<#if page.hasPermission("Write")>true<#else>false</#if>',
+   "tags" : [
+      <#list result.tags as tag>
+         "${tag}"<#if tag_has_next>,</#if>
+      </#list>  
+    ]
    <#if page.hasAspect("cm:versionable")>
       , "versionhistory" : [
 	   <#list page.versionHistory?sort_by("versionLabel")?reverse as record>