diff --git a/setup.py b/setup.py
index 5fcbaedaf29f89d8d99e2ff2274cbcd77d24861d..ba4a8fbb276897c3fb4d5c161cb05bd4fa079401 100644
--- a/setup.py
+++ b/setup.py
@@ -151,7 +151,9 @@ setup(
     install_requires=[
     'lxml',
     'prettierfier',
-    'flask'
+    'flask',
+    'flask_cors',
+    'requests'
     ],  # Optional
 
     # List additional groups of dependencies here (e.g. development
diff --git a/templates/xml/calibration_item.xml b/templates/xml/calibration_item.xml
index aa494ecc8c63dddf7de0a2e4605dc60b48c0f8b3..63c627bfc1b667fafde79dd69888421d2f03da01 100644
--- a/templates/xml/calibration_item.xml
+++ b/templates/xml/calibration_item.xml
@@ -23,9 +23,11 @@
     <dcc:description>
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:description>
@@ -48,9 +50,11 @@
         <dcc:description>
           {%- for k in j['description'] %}
           <dcc:content lang="{{k.lang}}">
+            <![CDATA[
             {%- for l in k.content %}
             {{l|safe}}
             {% endfor -%}
+            ]]>
           </dcc:content>
           {% endfor -%}            
         </dcc:description>          
diff --git a/templates/xml/core_data.xml b/templates/xml/core_data.xml
index 80719db071f28b35b9fc6e4a9b066d3922db8eeb..f2094cb1cd2b41a28925ecbcf74f48fd26820d89 100644
--- a/templates/xml/core_data.xml
+++ b/templates/xml/core_data.xml
@@ -20,9 +20,11 @@
           <dcc:description>
             {%- for j in i['description'] %}
             <dcc:content lang="{{j.lang}}">
+              <![CDATA[
               {%- for k in j.content %}
               {{k|safe}}
               {% endfor -%}
+              ]]>
             </dcc:content>
             {% endfor -%}            
           </dcc:description>          
diff --git a/templates/xml/used_methods.xml b/templates/xml/used_methods.xml
index 2fccbec21c57f0c14f48c7cd0a093e77664b87fa..ceb2fe92542e191063ce871ba7f3bad40d1e2142 100644
--- a/templates/xml/used_methods.xml
+++ b/templates/xml/used_methods.xml
@@ -13,9 +13,11 @@
     <dcc:description>
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
+        <![CDATA[
         {%- for k in j.content %}
         {{k|safe}}
         {% endfor -%}
+        ]]>
       </dcc:content>
       {% endfor -%}
     </dcc:description>