diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
index e2280bb113..49869d6c74 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
@@ -1,3 +1,5 @@
+<#macro json_string string>${string?js_string?replace("\\'", "\'")?replace("\\>", ">")}</#macro>
+
 <#macro aclChangeSetJSON aclChangeSet>
       {
          "id": ${aclChangeSet.id?c},
@@ -96,7 +98,7 @@
          <#if (nodeMetaData.parentAssocs?size > 0)>
          , "parentAssocs": [
            <#list nodeMetaData.parentAssocs as pa>
-           "${pa}"<#if pa_has_next>,</#if>
+           "<@json_string "${pa}"/>"<#if pa_has_next>,</#if>
            </#list>
          ]
          ,"parentAssocsCrc": <#if nodeMetaData.parentAssocsCrc??>${nodeMetaData.parentAssocsCrc?c}<#else>null</#if>
@@ -108,7 +110,7 @@
          <#if (nodeMetaData.childAssocs?size > 0)>
          , "childAssocs": [
            <#list nodeMetaData.childAssocs as ca>
-           "${ca}"<#if ca_has_next>,</#if>
+           "<@json_string "${ca}"/>"<#if ca_has_next>,</#if>
            </#list>
          ]
          </#if>