diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
index 027c20d0fa..743188cc97 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
@@ -1,9 +1,10 @@
 <#macro personJSON person>
-{
-   "url" : "${url.serviceContext}/api/person/${person.properties.userName}",
+<#escape x as jsonUtils.encodeJSONString(x)>
+{	
+   "url" : "${url.serviceContext + "/api/person/" + person.properties.userName}",
    "userName" : "${person.properties.userName}",
    <#if person.assocs["cm:avatar"]??>
-   "avatar" : "api/node/${person.assocs["cm:avatar"][0].nodeRef?string?replace('://','/')}/content/thumbnails/avatar",
+   "avatar" : "${"api/node/" + person.assocs["cm:avatar"][0].nodeRef?string?replace('://','/') + "/content/thumbnails/avatar"}",
    </#if>
    <#if person.properties.title??>
       "title" : "${person.properties.title}",
@@ -36,13 +37,16 @@
       "email" : null
    </#if>
 }
+</#escape>
 </#macro>
 
 <#macro personSummaryJSON person>
+<#escape x as jsonUtils.encodeJSONString(x)>
 {
-   "url" : "${url.serviceContext}/api/person/${person.properties.userName}",
+   "url" : "${url.serviceContext + "/api/person/" + person.properties.userName}",
    "userName" : "${person.properties.userName}",
    "firstName" : "${person.properties.firstName}",
    "lastName" : "${person.properties.lastName}"
 }
+</#escape>
 </#macro>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl
index e69de29bb2..9e26dfeeb6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl
index e69de29bb2..9e26dfeeb6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl
index ca6f6db9c6..b01171f6df 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl
@@ -1,13 +1,15 @@
 <#macro membershipJSON site role person>
-{
-   "role" : "${role}",
-   "person":
-   {
- 	  "userName" : "${person.properties.userName}",
- 	  "url" : "${url.serviceContext}/api/people/${person.properties.userName}",	 		      	 		   
- 	  "firstName" : "${person.properties.firstName}",
-      "lastName" : "${person.properties.lastName}"
-   },
-   "url" : "${url.serviceContext}/api/sites/${site.shortName}/memberships/${person.properties.userName}"	 		       
-}
+	<#escape x as jsonUtils.encodeJSONString(x)>
+		{
+		   "role" : "${role}",
+		   "person":
+		   {
+		 	  "userName" : "${person.properties.userName}",
+		 	  "url" : "${url.serviceContext + "/api/people/" + person.properties.userName}",	 		      	 		   
+		 	  "firstName" : "${person.properties.firstName}",
+		      "lastName" : "${person.properties.lastName}"
+		   },
+		   "url" : "${url.serviceContext + "/api/sites/" + site.shortName + "/memberships/" + person.properties.userName}"	 		       
+		}
+	</#escape>
 </#macro>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
index e00cfc9425..0687876263 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
@@ -1,14 +1,16 @@
 <#macro siteJSON site>
-{
-	"url" : "${url.serviceContext}/api/sites/${site.shortName}",
-	"sitePreset" : "${site.sitePreset}",
-	"shortName" : "${site.shortName}",
-	"title" : "${site.title}",
-	"description" : "${site.description}",
-	<#if site.node?exists>
-	   "node" : "${url.serviceContext}/api/node/${site.node.storeType}/${site.node.storeId}/${site.node.id}",
-	   "tagScope" : "${url.serviceContext}/api/tagscopes/${site.node.storeType}/${site.node.storeId}/${site.node.id}",
-	</#if>
-	"isPublic" : ${site.isPublic?string("true", "false")}
-}
+	<#escape x as jsonUtils.encodeJSONString(x)>
+		{
+			"url" : "${url.serviceContext + "/api/sites/" + site.shortName}",
+			"sitePreset" : "${site.sitePreset}",
+			"shortName" : "${site.shortName}",
+			"title" : "${site.title}",
+			"description" : "${site.description}",
+			<#if site.node?exists>
+			   "node" : "${url.serviceContext + "/api/node/" + site.node.storeType + "/" + site.node.storeId + "/" + site.node.id}",
+			   "tagScope" : "${url.serviceContext + "/api/tagscopes/" + site.node.storeType + "/" + site.node.storeId + "/" + site.node.id}",
+			</#if>
+			"isPublic" : ${site.isPublic?string("true", "false")}
+		}
+	</#escape>
 </#macro>
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl
index a879d21096..2e4aa788ce 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl
@@ -1,5 +1,5 @@
 [
 	<#list tags as tag>
-		${tag}<#if tag_has_next>,</#if>
+		${jsonUtils.encodeJSONString(tag)}<#if tag_has_next>,</#if>
 	</#list>
 ]
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl
index a879d21096..2e4aa788ce 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl
@@ -1,5 +1,5 @@
 [
 	<#list tags as tag>
-		${tag}<#if tag_has_next>,</#if>
+		${jsonUtils.encodeJSONString(tag)}<#if tag_has_next>,</#if>
 	</#list>
 ]
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl
index d910a76af5..58ac6f06a5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl
@@ -1,5 +1,5 @@
 <#macro tagJSON item>
 {
-   "name" : "${item.name?j_string}",
+   "name" : "${jsonUtils.encodeJSONString(item.name)}",
    "count" : ${item.count}
 }</#macro>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl
index a879d21096..2e4aa788ce 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl
@@ -1,5 +1,5 @@
 [
 	<#list tags as tag>
-		${tag}<#if tag_has_next>,</#if>
+		${jsonUtils.encodeJSONString(tag)}<#if tag_has_next>,</#if>
 	</#list>
 ]
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl
index e67f0025bd..c090f9ebe1 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl
@@ -1,8 +1,10 @@
 [
-<#list nodes as node>
-	{
-		"nodeRef" : "${node.storeType}://${node.storeId}/${node.id}",
-		"url" : "${url.serviceContext}/api/node/${node.storeType}/${node.storeId}/${node.id}"
-	}<#if node_has_next>,</#if>
-</#list>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	<#list nodes as node>
+		{
+			"nodeRef" : "${node.storeType + "://" + node.storeId + "/" + node.id}",
+			"url" : "${url.serviceContext + "/api/node/" + node.storeType + "/" + node.storeId + "/" + node.id}"
+		}<#if node_has_next>,</#if>
+	</#list>
+</#escape>
 ]
\ No newline at end of file
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl
index 4754aed9ef..1c8be14434 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl
@@ -1,6 +1,8 @@
 <#macro thumbnailJSON node thumbnailName>
+<#escape x as jsonUtils.encodeJSONString(x)>
 {
    "thumbnailName" : "${thumbnailName}",
-   "url" : "${url.serviceContext}/api/node/${node.storeType}/${node.storeId}/${node.id}/content/thumbnails/${thumbnailName}"
+   "url" : "${url.serviceContext + "/api/node/" + node.storeType + "/" + node.storeId+ "/" + node.id + "/content/thumbnails/" + thumbnailName}"
 }
+</#escape>
 </#macro>
\ No newline at end of file