diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml
index 63c627bfc1b667fafde79dd69888421d2f03da01..30b54deafc4d7ec18b40df95bd5abd77722f8cdf 100644
--- a/templates/xml/calibration_item.xml
+++ b/templates/xml/calibration_item.xml
@@ -3,9 +3,11 @@
   <dcc:name>   
     {%- for i in x['name'] %}
     <dcc:content lang="{{i.lang}}">
+      <![CDATA[
       {%- for j in i.content %}
       {{j|safe}}
       {% endfor -%}
+      ]]>
     </dcc:content>
     {% endfor -%}
   </dcc:name>  
@@ -14,9 +16,11 @@
     <dcc:name>   
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>    
@@ -35,9 +39,11 @@
       <dcc:name>   
         {%- for j in i.manufacturer['name'] %} 
         <dcc:content lang="{{j.lang}}">
+          <![CDATA[
           {%- for k in j.content %}
           {{k|safe}}
           {% endfor -%}
+          ]]>
         </dcc:content>
         {% endfor -%}
       </dcc:name>        
diff --git a/templates/xml/calibration_laboratory.xml b/templates/xml/calibration_laboratory.xml
index 2285ff973125e542f6a5552444ed7798c7afd13f..3cdc5f7b05cc24304b176c2f938386bd005788d3 100644
--- a/templates/xml/calibration_laboratory.xml
+++ b/templates/xml/calibration_laboratory.xml
@@ -4,9 +4,11 @@
     <dcc:name>   
       {%- for i in x['name'] %}
       <dcc:content lang="{{i.lang}}">
+        <![CDATA[
         {%- for j in i.content %}
         {{j|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>  
@@ -15,9 +17,11 @@
       <dcc:further>
         {%- for i in x.location.further %}
          <dcc:content lang="{{i.lang}}">
-           {%- for j in i.content %}
-           {{j|safe}}
-           {% endfor -%}
+          <![CDATA[
+          {%- for j in i.content %}
+          {{j|safe}}
+          {% endfor -%}
+          ]]>
          </dcc:content>
         {% endfor -%}
       </dcc:further>
diff --git a/templates/xml/customer.xml b/templates/xml/customer.xml
index 34ae0605d1c9bae7e830b3c0a690ca2fd42f09cb..763832916f7586097a1b4efb42378718be29ee71 100644
--- a/templates/xml/customer.xml
+++ b/templates/xml/customer.xml
@@ -3,9 +3,11 @@
   <dcc:name>   
     {%- for i in x['name'] %}
     <dcc:content lang="{{i.lang}}">
+      <![CDATA[
       {%- for j in i.content %}
       {{j|safe}}
       {% endfor -%}
+      ]]>
     </dcc:content>
     {% endfor -%}
   </dcc:name>
diff --git a/templates/xml/influence_conditions.xml b/templates/xml/influence_conditions.xml
index 6120058d8ccf49a974281d60242f681097437b0c..bbd30d2b3446af30e6fbf68863648301286e6e50 100644
--- a/templates/xml/influence_conditions.xml
+++ b/templates/xml/influence_conditions.xml
@@ -8,9 +8,11 @@
     <dcc:name>
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%} 
     </dcc:name>
@@ -22,9 +24,11 @@
         <dcc:name>
           {%- for l in v['name'] %}
           <dcc:content lang="{{l.lang}}">
+            <![CDATA[
             {%- for m in l.content %}
             {{m|safe}}
             {% endfor -%}
+            ]]>
           </dcc:content>
           {% endfor -%}
         </dcc:name>
diff --git a/templates/xml/responsible_persons.xml b/templates/xml/responsible_persons.xml
index 17d6318de61793adf503be6b18068df1d29d8218..e94960d59f8978cb14063fe1d5a53d6371e003e9 100644
--- a/templates/xml/responsible_persons.xml
+++ b/templates/xml/responsible_persons.xml
@@ -5,9 +5,11 @@
       <dcc:name>   
         {%- for j in i.person['name'] %}
         <dcc:content lang="{{j.lang}}">
+          <![CDATA[
           {%- for k in j.content %}
           {{k|safe}}
           {% endfor -%}
+          ]]>
         </dcc:content>
         {% endfor -%}
       </dcc:name>      
diff --git a/templates/xml/results.xml b/templates/xml/results.xml
index 49b0410b10748a98f704732aa94df5b914c366a0..1d9ce9e484595d7e53226bd96e672dfbd993f326 100644
--- a/templates/xml/results.xml
+++ b/templates/xml/results.xml
@@ -4,9 +4,11 @@
     <dcc:name>
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>
@@ -16,9 +18,11 @@
         <dcc:name>
           {%- for k in j['name'] %}
           <dcc:content lang="{{k.lang}}">
+            <![CDATA[
             {%- for l in k.content %}
             {{l|safe}}
             {% endfor -%}
+            ]]>
           </dcc:content>
           {% endfor -%}
         </dcc:name>        
diff --git a/templates/xml/used_methods.xml b/templates/xml/used_methods.xml
index ceb2fe92542e191063ce871ba7f3bad40d1e2142..c7ba8270d3ead02c56735e0067db568241107641 100644
--- a/templates/xml/used_methods.xml
+++ b/templates/xml/used_methods.xml
@@ -4,9 +4,11 @@
     <dcc:name {%- if i.id %} id="{{i.id}}" {% endif -%}>   
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>
diff --git a/templates/xml/used_software.xml b/templates/xml/used_software.xml
index 3cde4eab0d17dd93905bdd8b23b1dfa2193844ed..23bade39f606c6b5aee663045647c254c846eff2 100644
--- a/templates/xml/used_software.xml
+++ b/templates/xml/used_software.xml
@@ -4,9 +4,11 @@
     <dcc:name>   
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>