diff --git a/core/includes/common.inc b/core/includes/common.inc
index d05ee0c..5f874a6 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -366,7 +366,7 @@ function format_xml_elements($array) {
         }
 
         if (isset($value['value']) && $value['value'] != '') {
-          $output .= '>' . (is_array($value['value']) ? format_xml_elements($value['value']) : String::checkPlain($value['value'])) . '</' . $value['key'] . ">\n";
+          $output .= '>' . (is_array($value['value']) ? format_xml_elements($value['value']) : (!empty($value['encoded']) ? $value['value'] : String::checkPlain($value['value']))) . '</' . $value['key'] . ">\n";
         }
         else {
           $output .= " />\n";