diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml
index 30b54deafc4d7ec18b40df95bd5abd77722f8cdf..50eb6d2e64573cd650917c45d4f04834f70abd99 100644
--- a/templates/xml/calibration_item.xml
+++ b/templates/xml/calibration_item.xml
@@ -3,11 +3,7 @@
   <dcc:name>   
     {%- for i in x['name'] %}
     <dcc:content lang="{{i.lang}}">
-      <![CDATA[
-      {%- for j in i.content %}
-      {{j|safe}}
-      {% endfor -%}
-      ]]>
+      <![CDATA[{%- for j in i.content %}{{j|safe}}{% endfor -%}]]>
     </dcc:content>
     {% endfor -%}
   </dcc:name>  
@@ -16,22 +12,14 @@
     <dcc:name>   
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
-        {%- for k in j.content %}
-        {{k|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>    
     <dcc:description>
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
-        {%- for k in j.content %}
-        {{k|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:description>
@@ -39,11 +27,7 @@
       <dcc:name>   
         {%- for j in i.manufacturer['name'] %} 
         <dcc:content lang="{{j.lang}}">
-          <![CDATA[
-          {%- for k in j.content %}
-          {{k|safe}}
-          {% endfor -%}
-          ]]>
+          <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
         </dcc:content>
         {% endfor -%}
       </dcc:name>        
@@ -56,11 +40,7 @@
         <dcc:description>
           {%- for k in j['description'] %}
           <dcc:content lang="{{k.lang}}">
-            <![CDATA[
-            {%- for l in k.content %}
-            {{l|safe}}
-            {% endfor -%}
-            ]]>
+            <![CDATA[{%- for l in k.content %}{{l|safe}}{% endfor -%}]]>
           </dcc:content>
           {% endfor -%}            
         </dcc:description>          
diff --git a/templates/xml/calibration_laboratory.xml b/templates/xml/calibration_laboratory.xml
index 3cdc5f7b05cc24304b176c2f938386bd005788d3..6c1d5fb118e60424848772aa2e72bfdc7483ec0c 100644
--- a/templates/xml/calibration_laboratory.xml
+++ b/templates/xml/calibration_laboratory.xml
@@ -4,11 +4,7 @@
     <dcc:name>   
       {%- for i in x['name'] %}
       <dcc:content lang="{{i.lang}}">
-        <![CDATA[
-        {%- for j in i.content %}
-        {{j|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for j in i.content %}{{j|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>  
@@ -17,11 +13,7 @@
       <dcc:further>
         {%- for i in x.location.further %}
          <dcc:content lang="{{i.lang}}">
-          <![CDATA[
-          {%- 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/core_data.xml b/templates/xml/core_data.xml
index f2094cb1cd2b41a28925ecbcf74f48fd26820d89..db36439c403fa10ed752dc2c5a62909ddec0f5e2 100644
--- a/templates/xml/core_data.xml
+++ b/templates/xml/core_data.xml
@@ -20,11 +20,7 @@
           <dcc:description>
             {%- for j in i['description'] %}
             <dcc:content lang="{{j.lang}}">
-              <![CDATA[
-              {%- for k in j.content %}
-              {{k|safe}}
-              {% endfor -%}
-              ]]>
+              <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
             </dcc:content>
             {% endfor -%}            
           </dcc:description>          
diff --git a/templates/xml/customer.xml b/templates/xml/customer.xml
index 763832916f7586097a1b4efb42378718be29ee71..ce2c64bafbfdda88930518d6d356f8e5b2255414 100644
--- a/templates/xml/customer.xml
+++ b/templates/xml/customer.xml
@@ -3,11 +3,7 @@
   <dcc:name>   
     {%- for i in x['name'] %}
     <dcc:content lang="{{i.lang}}">
-      <![CDATA[
-      {%- for j in i.content %}
-      {{j|safe}}
-      {% endfor -%}
-      ]]>
+      <![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 bbd30d2b3446af30e6fbf68863648301286e6e50..b279c4a7e4694dc88a316ffd56056b437216475f 100644
--- a/templates/xml/influence_conditions.xml
+++ b/templates/xml/influence_conditions.xml
@@ -8,11 +8,7 @@
     <dcc:name>
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
-        {%- for k in j.content %}
-        {{k|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%} 
     </dcc:name>
@@ -24,11 +20,7 @@
         <dcc:name>
           {%- for l in v['name'] %}
           <dcc:content lang="{{l.lang}}">
-            <![CDATA[
-            {%- for m in l.content %}
-            {{m|safe}}
-            {% endfor -%}
-            ]]>
+            <![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 e94960d59f8978cb14063fe1d5a53d6371e003e9..f62e8fc30d8269ed0a7d18a9ebcddd568e397c52 100644
--- a/templates/xml/responsible_persons.xml
+++ b/templates/xml/responsible_persons.xml
@@ -5,11 +5,7 @@
       <dcc:name>   
         {%- for j in i.person['name'] %}
         <dcc:content lang="{{j.lang}}">
-          <![CDATA[
-          {%- for k in j.content %}
-          {{k|safe}}
-          {% endfor -%}
-          ]]>
+          <![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 1d9ce9e484595d7e53226bd96e672dfbd993f326..105bbcce0adeefba939c74e7b47d461b82837f9a 100644
--- a/templates/xml/results.xml
+++ b/templates/xml/results.xml
@@ -4,11 +4,7 @@
     <dcc:name>
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
-        {%- for k in j.content %}
-        {{k|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>
@@ -18,11 +14,7 @@
         <dcc:name>
           {%- for k in j['name'] %}
           <dcc:content lang="{{k.lang}}">
-            <![CDATA[
-            {%- for l in k.content %}
-            {{l|safe}}
-            {% endfor -%}
-            ]]>
+            <![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 c7ba8270d3ead02c56735e0067db568241107641..d49c736ba535c49a9131937573c940bae16b15b4 100644
--- a/templates/xml/used_methods.xml
+++ b/templates/xml/used_methods.xml
@@ -4,22 +4,14 @@
     <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 -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{%endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>
     <dcc:description>
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
-        {%- for k in j.content %}
-        {{k|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:description>    
diff --git a/templates/xml/used_software.xml b/templates/xml/used_software.xml
index 23bade39f606c6b5aee663045647c254c846eff2..89733e6cfdcd3f73744a31f42006c92870815b17 100644
--- a/templates/xml/used_software.xml
+++ b/templates/xml/used_software.xml
@@ -4,11 +4,7 @@
     <dcc:name>   
       {%- for j in i['name'] %}
       <dcc:content lang="{{j.lang}}">
-        <![CDATA[
-        {%- for k in j.content %}
-        {{k|safe}}
-        {% endfor -%}
-        ]]>
+        <![CDATA[{%- for k in j.content %}{{k|safe}}{% endfor -%}]]>
       </dcc:content>
       {% endfor -%}
     </dcc:name>