diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig
index 72c3f2d95f84d61099781bc94cf1cf4456116393..c7d3556c5f2db455340eb0ce5315938f47b90b57 100644
--- a/plugins/CoreHome/templates/_dataTableCell.twig
+++ b/plugins/CoreHome/templates/_dataTableCell.twig
@@ -13,9 +13,8 @@
     {% if row.metadata.html_label_prefix is defined %}<span class='label-prefix'>{{ row.metadata.html_label_prefix | raw }}&nbsp;</span>{% endif -%}
         <span class='label{% if row.metadata.is_aggregate is defined and row.metadata.is_aggregate %} highlighted{% endif %}'
         {% if properties is defined and properties.tooltip_metadata_name is not empty %}title="{{ row.metadata[properties.tooltip_metadata_name] }}"{% endif %}>
-        {% if row.metadata.html_label_suffix is defined %}<span class='label-suffix'>{{ row.metadata.html_label_suffix | raw }}</span>{% endif %}
-    {% endif %}
-{% if row.columns[column] is defined %}{{ row.columns[column]|raw }}{% else %}{{ defaultWhenColumnValueNotDefined }}{% endif %}
+        {%- if row.metadata.html_label_suffix is defined %}<span class='label-suffix'>{{ row.metadata.html_label_suffix | raw }}</span>{% endif -%}
+{% endif %}{% if row.columns[column] is defined %}{{- row.columns[column]|raw -}}{% else %}{{ defaultWhenColumnValueNotDefined }}{% endif %}
 {% if column=='label' %}</span>{% endif %}
 {% if not row.idsubdatatable and column=='label' and row.metadata.url is defined %}
     </a>
diff --git a/plugins/SEO/templates/getRank.twig b/plugins/SEO/templates/getRank.twig
index 17563b56198363c79f7b41a88e6d48e3d4ba2d20..8e0882c80b00c98da9b9322ef9d8c315537215f4 100644
--- a/plugins/SEO/templates/getRank.twig
+++ b/plugins/SEO/templates/getRank.twig
@@ -36,7 +36,7 @@
                             <td>
                                 <div style='margin-left:15px'>
                                 {% if rank.logo_link is defined %}{{ seoLink|raw }}{% endif %}
-                                    {% if rank.rank %}{{ rank.rank }}{% else %}-{% endif %}
+                                    {% if rank.rank %}{{ rank.rank|raw }}{% else %}-{% endif %}
                                     {% if rank.id=='pagerank' %} /10
                                     {% elseif rank.id=='google-index' or rank.id=='bing-index' %} {{ 'SEO_Pages'|translate }}
                                     {% endif %}