diff --git a/src/generic/generic-component-accordion/generic-component-accordion.twig b/src/generic/generic-component-accordion/generic-component-accordion.twig
index 4e8a1950a83..7a1a1d14fd6 100644
--- a/src/generic/generic-component-accordion/generic-component-accordion.twig
+++ b/src/generic/generic-component-accordion/generic-component-accordion.twig
@@ -37,7 +37,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-banner/generic-component-banner.twig b/src/generic/generic-component-banner/generic-component-banner.twig
index cf198813a65..5a05e917b14 100644
--- a/src/generic/generic-component-banner/generic-component-banner.twig
+++ b/src/generic/generic-component-banner/generic-component-banner.twig
@@ -43,7 +43,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-blockquote/generic-component-blockquote.twig b/src/generic/generic-component-blockquote/generic-component-blockquote.twig
index 3178e7fb07a..69d3fd39932 100644
--- a/src/generic/generic-component-blockquote/generic-component-blockquote.twig
+++ b/src/generic/generic-component-blockquote/generic-component-blockquote.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-breadcrumb/generic-component-breadcrumb.twig b/src/generic/generic-component-breadcrumb/generic-component-breadcrumb.twig
index 4457e1fe12f..96aedde0ba1 100644
--- a/src/generic/generic-component-breadcrumb/generic-component-breadcrumb.twig
+++ b/src/generic/generic-component-breadcrumb/generic-component-breadcrumb.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-button/generic-component-button.twig b/src/generic/generic-component-button/generic-component-button.twig
index 757cad3f710..59daa54902a 100644
--- a/src/generic/generic-component-button/generic-component-button.twig
+++ b/src/generic/generic-component-button/generic-component-button.twig
@@ -49,7 +49,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-carousel/generic-component-carousel.twig b/src/generic/generic-component-carousel/generic-component-carousel.twig
index 3c3cdec89d4..3ebe8b79ef6 100644
--- a/src/generic/generic-component-carousel/generic-component-carousel.twig
+++ b/src/generic/generic-component-carousel/generic-component-carousel.twig
@@ -61,7 +61,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
@@ -69,7 +69,7 @@
 {% if heading_attributes is defined %}
   {% for heading_attr in heading_attributes %}
     {% if heading_attr != 'id' %}
-      {% set _heading_attributes = _heading_attributes ~ ' ' ~ heading_attr.name ~ '="' ~ heading_attr.value ~ '"' %}
+      {% set _heading_attributes = _heading_attributes ~ ' ' ~ heading_attr.name ~ '="' ~ heading_attr.value|e ~ '"' %}
     {% endif %}
   {% endfor %}
 {% endif %}
diff --git a/src/generic/generic-component-comment/generic-component-comment.twig b/src/generic/generic-component-comment/generic-component-comment.twig
index 883fd5e9bcd..534c1d3eba4 100644
--- a/src/generic/generic-component-comment/generic-component-comment.twig
+++ b/src/generic/generic-component-comment/generic-component-comment.twig
@@ -51,7 +51,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-context-nav/generic-component-context-nav.twig b/src/generic/generic-component-context-nav/generic-component-context-nav.twig
index e4966695a04..2c805163819 100644
--- a/src/generic/generic-component-context-nav/generic-component-context-nav.twig
+++ b/src/generic/generic-component-context-nav/generic-component-context-nav.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-date-block/generic-component-date-block.twig b/src/generic/generic-component-date-block/generic-component-date-block.twig
index b0a52816efd..e0729d53f6c 100644
--- a/src/generic/generic-component-date-block/generic-component-date-block.twig
+++ b/src/generic/generic-component-date-block/generic-component-date-block.twig
@@ -37,7 +37,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-datepicker/generic-component-datepicker.twig b/src/generic/generic-component-datepicker/generic-component-datepicker.twig
index 3b6382911e4..794ed9f2bd7 100644
--- a/src/generic/generic-component-datepicker/generic-component-datepicker.twig
+++ b/src/generic/generic-component-datepicker/generic-component-datepicker.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-dialog/generic-component-dialog.twig b/src/generic/generic-component-dialog/generic-component-dialog.twig
index 3166ee77ef0..68044525bf3 100644
--- a/src/generic/generic-component-dialog/generic-component-dialog.twig
+++ b/src/generic/generic-component-dialog/generic-component-dialog.twig
@@ -66,7 +66,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-featured-item/generic-component-featured-item.twig b/src/generic/generic-component-featured-item/generic-component-featured-item.twig
index 8c0694927a9..36daaa2a8ac 100644
--- a/src/generic/generic-component-featured-item/generic-component-featured-item.twig
+++ b/src/generic/generic-component-featured-item/generic-component-featured-item.twig
@@ -45,7 +45,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-field/generic-component-field.twig b/src/generic/generic-component-field/generic-component-field.twig
index f4ba8f86aad..2d2a05b54d7 100644
--- a/src/generic/generic-component-field/generic-component-field.twig
+++ b/src/generic/generic-component-field/generic-component-field.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-file/generic-component-file.twig b/src/generic/generic-component-file/generic-component-file.twig
index 58646174303..cf38dbd7c8b 100644
--- a/src/generic/generic-component-file/generic-component-file.twig
+++ b/src/generic/generic-component-file/generic-component-file.twig
@@ -72,7 +72,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-checkbox/generic-component-form-checkbox.twig b/src/generic/generic-component-form-checkbox/generic-component-form-checkbox.twig
index f84357c0f5d..c327c11d3be 100644
--- a/src/generic/generic-component-form-checkbox/generic-component-form-checkbox.twig
+++ b/src/generic/generic-component-form-checkbox/generic-component-form-checkbox.twig
@@ -53,7 +53,7 @@
 
 {% if input_attributes is defined and input_attributes is not empty and input_attributes is iterable %}
   {% for attr in input_attributes %}
-    {% set _input_attributes = _input_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _input_attributes = _input_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-feedback-message/generic-component-form-feedback-message.twig b/src/generic/generic-component-form-feedback-message/generic-component-form-feedback-message.twig
index 97c2ce4f0d7..90c946b9639 100644
--- a/src/generic/generic-component-form-feedback-message/generic-component-form-feedback-message.twig
+++ b/src/generic/generic-component-form-feedback-message/generic-component-form-feedback-message.twig
@@ -32,7 +32,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-fieldset/generic-component-form-fieldset.twig b/src/generic/generic-component-form-fieldset/generic-component-form-fieldset.twig
index b8803a8f718..1a982671e5a 100644
--- a/src/generic/generic-component-form-fieldset/generic-component-form-fieldset.twig
+++ b/src/generic/generic-component-form-fieldset/generic-component-form-fieldset.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-file-upload/generic-component-form-file-upload.twig b/src/generic/generic-component-form-file-upload/generic-component-form-file-upload.twig
index 20e5d52a74e..aa538c3ce71 100644
--- a/src/generic/generic-component-form-file-upload/generic-component-form-file-upload.twig
+++ b/src/generic/generic-component-form-file-upload/generic-component-form-file-upload.twig
@@ -49,7 +49,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-form-group/generic-component-form-form-group.twig b/src/generic/generic-component-form-form-group/generic-component-form-form-group.twig
index af84f20d703..addab2c828a 100644
--- a/src/generic/generic-component-form-form-group/generic-component-form-form-group.twig
+++ b/src/generic/generic-component-form-form-group/generic-component-form-form-group.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-form/generic-component-form-form.twig b/src/generic/generic-component-form-form/generic-component-form-form.twig
index ba4b6352953..29aafb7c9d4 100644
--- a/src/generic/generic-component-form-form/generic-component-form-form.twig
+++ b/src/generic/generic-component-form-form/generic-component-form-form.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-help-block/generic-component-form-help-block.twig b/src/generic/generic-component-form-help-block/generic-component-form-help-block.twig
index f3d602b6cb2..83283f89578 100644
--- a/src/generic/generic-component-form-help-block/generic-component-form-help-block.twig
+++ b/src/generic/generic-component-form-help-block/generic-component-form-help-block.twig
@@ -39,7 +39,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-label/generic-component-form-label.twig b/src/generic/generic-component-form-label/generic-component-form-label.twig
index 92ba3313ae3..9e92b7c3185 100644
--- a/src/generic/generic-component-form-label/generic-component-form-label.twig
+++ b/src/generic/generic-component-form-label/generic-component-form-label.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-legend/generic-component-form-legend.twig b/src/generic/generic-component-form-legend/generic-component-form-legend.twig
index 08cd878023e..b30f8712841 100644
--- a/src/generic/generic-component-form-legend/generic-component-form-legend.twig
+++ b/src/generic/generic-component-form-legend/generic-component-form-legend.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-radio-group/generic-component-form-radio-group.twig b/src/generic/generic-component-form-radio-group/generic-component-form-radio-group.twig
index a133b8cb72e..5f1ff707696 100644
--- a/src/generic/generic-component-form-radio-group/generic-component-form-radio-group.twig
+++ b/src/generic/generic-component-form-radio-group/generic-component-form-radio-group.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-radio/generic-component-form-radio.twig b/src/generic/generic-component-form-radio/generic-component-form-radio.twig
index 2f3191b0e45..252741bcb65 100644
--- a/src/generic/generic-component-form-radio/generic-component-form-radio.twig
+++ b/src/generic/generic-component-form-radio/generic-component-form-radio.twig
@@ -54,7 +54,7 @@
 
 {% if input_attributes is defined and input_attributes is not empty and input_attributes is iterable %}
   {% for attr in input_attributes %}
-    {% set _input_attributes = _input_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _input_attributes = _input_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-select/generic-component-form-select.twig b/src/generic/generic-component-form-select/generic-component-form-select.twig
index 4fcf745156d..c5189b75334 100644
--- a/src/generic/generic-component-form-select/generic-component-form-select.twig
+++ b/src/generic/generic-component-form-select/generic-component-form-select.twig
@@ -49,7 +49,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-text-input/generic-component-form-text-input.twig b/src/generic/generic-component-form-text-input/generic-component-form-text-input.twig
index 540e41606a1..d3ed1d37726 100644
--- a/src/generic/generic-component-form-text-input/generic-component-form-text-input.twig
+++ b/src/generic/generic-component-form-text-input/generic-component-form-text-input.twig
@@ -41,7 +41,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-form-textarea/generic-component-form-textarea.twig b/src/generic/generic-component-form-textarea/generic-component-form-textarea.twig
index 79552879665..2414cb4e15e 100644
--- a/src/generic/generic-component-form-textarea/generic-component-form-textarea.twig
+++ b/src/generic/generic-component-form-textarea/generic-component-form-textarea.twig
@@ -41,7 +41,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-gallery/generic-component-gallery.twig b/src/generic/generic-component-gallery/generic-component-gallery.twig
index 180843e992f..adb8f0d6fd5 100644
--- a/src/generic/generic-component-gallery/generic-component-gallery.twig
+++ b/src/generic/generic-component-gallery/generic-component-gallery.twig
@@ -35,7 +35,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-inpage-navigation/generic-component-inpage-navigation.twig b/src/generic/generic-component-inpage-navigation/generic-component-inpage-navigation.twig
index de81be9e165..f6c464a4b81 100644
--- a/src/generic/generic-component-inpage-navigation/generic-component-inpage-navigation.twig
+++ b/src/generic/generic-component-inpage-navigation/generic-component-inpage-navigation.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-label/generic-component-label.twig b/src/generic/generic-component-label/generic-component-label.twig
index da59c92a9f1..c1d87df8c4f 100644
--- a/src/generic/generic-component-label/generic-component-label.twig
+++ b/src/generic/generic-component-label/generic-component-label.twig
@@ -31,7 +31,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-lang-select-page/generic-component-lang-select-page.twig b/src/generic/generic-component-lang-select-page/generic-component-lang-select-page.twig
index 5c3e36ee401..1c8ae8dca70 100644
--- a/src/generic/generic-component-lang-select-page/generic-component-lang-select-page.twig
+++ b/src/generic/generic-component-lang-select-page/generic-component-lang-select-page.twig
@@ -44,7 +44,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-lang-select-site/generic-component-lang-select-site.twig b/src/generic/generic-component-lang-select-site/generic-component-lang-select-site.twig
index 91b61542f65..8926bd0971d 100644
--- a/src/generic/generic-component-lang-select-site/generic-component-lang-select-site.twig
+++ b/src/generic/generic-component-lang-select-site/generic-component-lang-select-site.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-language-list/generic-component-language-list.twig b/src/generic/generic-component-language-list/generic-component-language-list.twig
index a4d33f2bb94..b370a8c253e 100644
--- a/src/generic/generic-component-language-list/generic-component-language-list.twig
+++ b/src/generic/generic-component-language-list/generic-component-language-list.twig
@@ -65,7 +65,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-link-block/generic-component-link-block.twig b/src/generic/generic-component-link-block/generic-component-link-block.twig
index fcdaa86733e..c7dc2cd4ba5 100644
--- a/src/generic/generic-component-link-block/generic-component-link-block.twig
+++ b/src/generic/generic-component-link-block/generic-component-link-block.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-link/generic-component-link.twig b/src/generic/generic-component-link/generic-component-link.twig
index 4f80e51eba7..83a1c1e85f0 100644
--- a/src/generic/generic-component-link/generic-component-link.twig
+++ b/src/generic/generic-component-link/generic-component-link.twig
@@ -41,7 +41,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-list-item/generic-component-list-item.twig b/src/generic/generic-component-list-item/generic-component-list-item.twig
index adf41b43f32..32ef9730d1d 100644
--- a/src/generic/generic-component-list-item/generic-component-list-item.twig
+++ b/src/generic/generic-component-list-item/generic-component-list-item.twig
@@ -51,7 +51,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-listing/generic-component-listing.twig b/src/generic/generic-component-listing/generic-component-listing.twig
index 899de7a64f5..e7760bf2b25 100644
--- a/src/generic/generic-component-listing/generic-component-listing.twig
+++ b/src/generic/generic-component-listing/generic-component-listing.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-logo/generic-component-logo.twig b/src/generic/generic-component-logo/generic-component-logo.twig
index faa10198759..0902c178ecf 100644
--- a/src/generic/generic-component-logo/generic-component-logo.twig
+++ b/src/generic/generic-component-logo/generic-component-logo.twig
@@ -42,7 +42,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-message/generic-component-message.twig b/src/generic/generic-component-message/generic-component-message.twig
index a49de05d786..a05b90a559c 100644
--- a/src/generic/generic-component-message/generic-component-message.twig
+++ b/src/generic/generic-component-message/generic-component-message.twig
@@ -41,7 +41,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-meta/generic-component-meta.twig b/src/generic/generic-component-meta/generic-component-meta.twig
index 2c8ec8305f9..9431a377e8c 100644
--- a/src/generic/generic-component-meta/generic-component-meta.twig
+++ b/src/generic/generic-component-meta/generic-component-meta.twig
@@ -31,7 +31,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-navigation-list/generic-component-navigation-list.twig b/src/generic/generic-component-navigation-list/generic-component-navigation-list.twig
index 4d0fe3bbe99..e230e3e39c6 100644
--- a/src/generic/generic-component-navigation-list/generic-component-navigation-list.twig
+++ b/src/generic/generic-component-navigation-list/generic-component-navigation-list.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-navigation-menu/generic-component-navigation-menu.twig b/src/generic/generic-component-navigation-menu/generic-component-navigation-menu.twig
index 367b3605df3..531271fb2c8 100644
--- a/src/generic/generic-component-navigation-menu/generic-component-navigation-menu.twig
+++ b/src/generic/generic-component-navigation-menu/generic-component-navigation-menu.twig
@@ -40,7 +40,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-page-header/generic-component-page-header.twig b/src/generic/generic-component-page-header/generic-component-page-header.twig
index bd00cc85107..4d2005b9af9 100644
--- a/src/generic/generic-component-page-header/generic-component-page-header.twig
+++ b/src/generic/generic-component-page-header/generic-component-page-header.twig
@@ -56,7 +56,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-pager/generic-component-pager.twig b/src/generic/generic-component-pager/generic-component-pager.twig
index b75355aaa32..93bd0cb0904 100644
--- a/src/generic/generic-component-pager/generic-component-pager.twig
+++ b/src/generic/generic-component-pager/generic-component-pager.twig
@@ -43,7 +43,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-profile-topbar/generic-component-profile-topbar.twig b/src/generic/generic-component-profile-topbar/generic-component-profile-topbar.twig
index 069589e9af7..952111c67b2 100644
--- a/src/generic/generic-component-profile-topbar/generic-component-profile-topbar.twig
+++ b/src/generic/generic-component-profile-topbar/generic-component-profile-topbar.twig
@@ -38,7 +38,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
@@ -59,7 +59,7 @@
   <div
     {% if profile.expandable.expandable_body.extra_attributes is defined %}
       {% for attr in profile.expandable.expandable_body.extra_attributes %}
-        {% set attribute = attr.name ~ '="' ~ attr.value ~ '"' %}
+        {% set attribute = attr.name ~ '="' ~ attr.value|e ~ '"' %}
         {{ attribute }}
       {% endfor %}
     {% endif %}
diff --git a/src/generic/generic-component-rss-link/generic-component-rss-link.twig b/src/generic/generic-component-rss-link/generic-component-rss-link.twig
index de8337785d1..ed3ea89bf4f 100644
--- a/src/generic/generic-component-rss-link/generic-component-rss-link.twig
+++ b/src/generic/generic-component-rss-link/generic-component-rss-link.twig
@@ -31,7 +31,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-search-form/generic-component-search-form.twig b/src/generic/generic-component-search-form/generic-component-search-form.twig
index 8217e8e815e..30c9d54bb76 100644
--- a/src/generic/generic-component-search-form/generic-component-search-form.twig
+++ b/src/generic/generic-component-search-form/generic-component-search-form.twig
@@ -37,7 +37,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-side-navigation/generic-component-side-navigation.twig b/src/generic/generic-component-side-navigation/generic-component-side-navigation.twig
index 1298af46e9b..931f905e73f 100644
--- a/src/generic/generic-component-side-navigation/generic-component-side-navigation.twig
+++ b/src/generic/generic-component-side-navigation/generic-component-side-navigation.twig
@@ -40,7 +40,7 @@
 
 {% if extra_attributes is defined %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~'"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-site-header/generic-component-site-header.twig b/src/generic/generic-component-site-header/generic-component-site-header.twig
index 21126c75db9..84c0f7fc399 100644
--- a/src/generic/generic-component-site-header/generic-component-site-header.twig
+++ b/src/generic/generic-component-site-header/generic-component-site-header.twig
@@ -50,7 +50,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-site-switcher/generic-component-site-switcher.twig b/src/generic/generic-component-site-switcher/generic-component-site-switcher.twig
index fa7a286648d..9a90d493444 100644
--- a/src/generic/generic-component-site-switcher/generic-component-site-switcher.twig
+++ b/src/generic/generic-component-site-switcher/generic-component-site-switcher.twig
@@ -51,7 +51,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-skip-link/generic-component-skip-link.twig b/src/generic/generic-component-skip-link/generic-component-skip-link.twig
index 77b1c18869e..3c1fe2641dd 100644
--- a/src/generic/generic-component-skip-link/generic-component-skip-link.twig
+++ b/src/generic/generic-component-skip-link/generic-component-skip-link.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-social-icon/generic-component-social-icon.twig b/src/generic/generic-component-social-icon/generic-component-social-icon.twig
index 28c43175620..3b4ae12e6a5 100644
--- a/src/generic/generic-component-social-icon/generic-component-social-icon.twig
+++ b/src/generic/generic-component-social-icon/generic-component-social-icon.twig
@@ -35,7 +35,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-social-media-link/generic-component-social-media-link.twig b/src/generic/generic-component-social-media-link/generic-component-social-media-link.twig
index 30ca7c3a697..90e34d4c160 100644
--- a/src/generic/generic-component-social-media-link/generic-component-social-media-link.twig
+++ b/src/generic/generic-component-social-media-link/generic-component-social-media-link.twig
@@ -42,7 +42,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-table/generic-component-table.twig b/src/generic/generic-component-table/generic-component-table.twig
index 241e15c7ba3..0e47a554ab6 100644
--- a/src/generic/generic-component-table/generic-component-table.twig
+++ b/src/generic/generic-component-table/generic-component-table.twig
@@ -43,7 +43,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-tag/generic-component-tag.twig b/src/generic/generic-component-tag/generic-component-tag.twig
index 5ca5cdcef93..120fffa07ce 100644
--- a/src/generic/generic-component-tag/generic-component-tag.twig
+++ b/src/generic/generic-component-tag/generic-component-tag.twig
@@ -38,7 +38,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-component-timeline/generic-component-timeline.twig b/src/generic/generic-component-timeline/generic-component-timeline.twig
index 93e1545e6fc..9ebec9e239e 100644
--- a/src/generic/generic-component-timeline/generic-component-timeline.twig
+++ b/src/generic/generic-component-timeline/generic-component-timeline.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/generic/generic-style-image/generic-style-image.twig b/src/generic/generic-style-image/generic-style-image.twig
index 65a96886394..40bb5be9960 100644
--- a/src/generic/generic-style-image/generic-style-image.twig
+++ b/src/generic/generic-style-image/generic-style-image.twig
@@ -38,7 +38,7 @@
 
 {% if extra_attributes is defined %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-dialog/ec-component-dialog.twig b/src/systems/ec/ec-component/ec-component-dialog/ec-component-dialog.twig
index 3166ee77ef0..68044525bf3 100644
--- a/src/systems/ec/ec-component/ec-component-dialog/ec-component-dialog.twig
+++ b/src/systems/ec/ec-component/ec-component-dialog/ec-component-dialog.twig
@@ -66,7 +66,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-featured-item/ec-component-featured-item.twig b/src/systems/ec/ec-component/ec-component-featured-item/ec-component-featured-item.twig
index 269673cbaa5..1ac0ab67756 100644
--- a/src/systems/ec/ec-component/ec-component-featured-item/ec-component-featured-item.twig
+++ b/src/systems/ec/ec-component/ec-component-featured-item/ec-component-featured-item.twig
@@ -45,7 +45,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-fieldset/ec-component-form-fieldset.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-fieldset/ec-component-form-fieldset.twig
index b8803a8f718..1a982671e5a 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-fieldset/ec-component-form-fieldset.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-fieldset/ec-component-form-fieldset.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~ '"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-form-group/ec-component-form-form-group.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-form-group/ec-component-form-form-group.twig
index af84f20d703..06427cc4bca 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-form-group/ec-component-form-form-group.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-form-group/ec-component-form-form-group.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-form/ec-component-form-form.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-form/ec-component-form-form.twig
index ba4b6352953..c9dcc5688c9 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-form/ec-component-form-form.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-form/ec-component-form-form.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-help-block/ec-component-form-help-block.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-help-block/ec-component-form-help-block.twig
index f3d602b6cb2..e4902ebbaf8 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-help-block/ec-component-form-help-block.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-help-block/ec-component-form-help-block.twig
@@ -39,7 +39,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-label/ec-component-form-label.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-label/ec-component-form-label.twig
index 92ba3313ae3..30aa48c1842 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-label/ec-component-form-label.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-label/ec-component-form-label.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-legend/ec-component-form-legend.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-legend/ec-component-form-legend.twig
index d48d4735847..52e2716edab 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-legend/ec-component-form-legend.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-legend/ec-component-form-legend.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-form/ec-component-form-select/ec-component-form-select.twig b/src/systems/ec/ec-component/ec-component-form/ec-component-form-select/ec-component-form-select.twig
index 4fcf745156d..95d497f55fa 100644
--- a/src/systems/ec/ec-component/ec-component-form/ec-component-form-select/ec-component-form-select.twig
+++ b/src/systems/ec/ec-component/ec-component-form/ec-component-form-select/ec-component-form-select.twig
@@ -49,7 +49,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-link/ec-component-link.twig b/src/systems/ec/ec-component/ec-component-link/ec-component-link.twig
index 4f80e51eba7..0cd600d9e14 100644
--- a/src/systems/ec/ec-component/ec-component-link/ec-component-link.twig
+++ b/src/systems/ec/ec-component/ec-component-link/ec-component-link.twig
@@ -41,7 +41,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-list-item/ec-component-list-item.twig b/src/systems/ec/ec-component/ec-component-list-item/ec-component-list-item.twig
index df7b413b629..8ad66180ca6 100644
--- a/src/systems/ec/ec-component/ec-component-list-item/ec-component-list-item.twig
+++ b/src/systems/ec/ec-component/ec-component-list-item/ec-component-list-item.twig
@@ -51,7 +51,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-login-bar/ec-component-login-bar.twig b/src/systems/ec/ec-component/ec-component-login-bar/ec-component-login-bar.twig
index 840f0d2a37f..300737e4fa7 100644
--- a/src/systems/ec/ec-component/ec-component-login-bar/ec-component-login-bar.twig
+++ b/src/systems/ec/ec-component/ec-component-login-bar/ec-component-login-bar.twig
@@ -35,7 +35,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-navigation/ec-component-navigation-menu/ec-component-navigation-menu.twig b/src/systems/ec/ec-component/ec-component-navigation/ec-component-navigation-menu/ec-component-navigation-menu.twig
index 367b3605df3..06225ae75f5 100644
--- a/src/systems/ec/ec-component/ec-component-navigation/ec-component-navigation-menu/ec-component-navigation-menu.twig
+++ b/src/systems/ec/ec-component/ec-component-navigation/ec-component-navigation-menu/ec-component-navigation-menu.twig
@@ -40,7 +40,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-navigation/ec-component-side-navigation/ec-component-side-navigation.twig b/src/systems/ec/ec-component/ec-component-navigation/ec-component-side-navigation/ec-component-side-navigation.twig
index 1298af46e9b..931f905e73f 100644
--- a/src/systems/ec/ec-component/ec-component-navigation/ec-component-side-navigation/ec-component-side-navigation.twig
+++ b/src/systems/ec/ec-component/ec-component-navigation/ec-component-side-navigation/ec-component-side-navigation.twig
@@ -40,7 +40,7 @@
 
 {% if extra_attributes is defined %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~'"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/ec/ec-component/ec-component-profile-topbar/ec-component-profile-topbar.twig b/src/systems/ec/ec-component/ec-component-profile-topbar/ec-component-profile-topbar.twig
index 2779518b58f..3b6d5e47e37 100644
--- a/src/systems/ec/ec-component/ec-component-profile-topbar/ec-component-profile-topbar.twig
+++ b/src/systems/ec/ec-component/ec-component-profile-topbar/ec-component-profile-topbar.twig
@@ -37,7 +37,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
@@ -58,7 +58,7 @@
   <div
     {% if profile.expandable.expandable_body.extra_attributes is defined %}
       {% for attr in profile.expandable.expandable_body.extra_attributes %}
-        {% set attribute = attr.name ~ '="' ~ attr.value ~ '"' %}
+        {% set attribute = attr.name ~ '="' ~ attr.value|e ~'"' %}
         {{ attribute }}
       {% endfor %}
     {% endif %}
diff --git a/src/systems/eu/eu-component/eu-component-dialog/eu-component-dialog.twig b/src/systems/eu/eu-component/eu-component-dialog/eu-component-dialog.twig
index 3166ee77ef0..9cf535b5487 100644
--- a/src/systems/eu/eu-component/eu-component-dialog/eu-component-dialog.twig
+++ b/src/systems/eu/eu-component/eu-component-dialog/eu-component-dialog.twig
@@ -66,7 +66,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-featured-item/eu-component-featured-item.twig b/src/systems/eu/eu-component/eu-component-featured-item/eu-component-featured-item.twig
index 4e21e62213e..a6c3b4605f9 100644
--- a/src/systems/eu/eu-component/eu-component-featured-item/eu-component-featured-item.twig
+++ b/src/systems/eu/eu-component/eu-component-featured-item/eu-component-featured-item.twig
@@ -45,7 +45,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-fieldset/eu-component-form-fieldset.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-fieldset/eu-component-form-fieldset.twig
index b8803a8f718..23c21d404a2 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-fieldset/eu-component-form-fieldset.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-fieldset/eu-component-form-fieldset.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-form-group/eu-component-form-form-group.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-form-group/eu-component-form-form-group.twig
index af84f20d703..06427cc4bca 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-form-group/eu-component-form-form-group.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-form-group/eu-component-form-form-group.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-form/eu-component-form-form.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-form/eu-component-form-form.twig
index ba4b6352953..c9dcc5688c9 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-form/eu-component-form-form.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-form/eu-component-form-form.twig
@@ -27,7 +27,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-help-block/eu-component-form-help-block.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-help-block/eu-component-form-help-block.twig
index f3d602b6cb2..e4902ebbaf8 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-help-block/eu-component-form-help-block.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-help-block/eu-component-form-help-block.twig
@@ -39,7 +39,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-label/eu-component-form-label.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-label/eu-component-form-label.twig
index 92ba3313ae3..30aa48c1842 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-label/eu-component-form-label.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-label/eu-component-form-label.twig
@@ -29,7 +29,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-legend/eu-component-form-legend.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-legend/eu-component-form-legend.twig
index d48d4735847..52e2716edab 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-legend/eu-component-form-legend.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-legend/eu-component-form-legend.twig
@@ -33,7 +33,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-form/eu-component-form-select/eu-component-form-select.twig b/src/systems/eu/eu-component/eu-component-form/eu-component-form-select/eu-component-form-select.twig
index 4fcf745156d..95d497f55fa 100644
--- a/src/systems/eu/eu-component/eu-component-form/eu-component-form-select/eu-component-form-select.twig
+++ b/src/systems/eu/eu-component/eu-component-form/eu-component-form-select/eu-component-form-select.twig
@@ -49,7 +49,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-global-navigation/eu-component-global-navigation.twig b/src/systems/eu/eu-component/eu-component-global-navigation/eu-component-global-navigation.twig
index d1e742be80f..d55c3b9a310 100644
--- a/src/systems/eu/eu-component/eu-component-global-navigation/eu-component-global-navigation.twig
+++ b/src/systems/eu/eu-component/eu-component-global-navigation/eu-component-global-navigation.twig
@@ -34,7 +34,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-link/eu-component-link.twig b/src/systems/eu/eu-component/eu-component-link/eu-component-link.twig
index 4f80e51eba7..0cd600d9e14 100644
--- a/src/systems/eu/eu-component/eu-component-link/eu-component-link.twig
+++ b/src/systems/eu/eu-component/eu-component-link/eu-component-link.twig
@@ -41,7 +41,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-list-item/eu-component-list-item.twig b/src/systems/eu/eu-component/eu-component-list-item/eu-component-list-item.twig
index 9ec5f07a883..1ee7543022e 100644
--- a/src/systems/eu/eu-component/eu-component-list-item/eu-component-list-item.twig
+++ b/src/systems/eu/eu-component/eu-component-list-item/eu-component-list-item.twig
@@ -51,7 +51,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-navigation/eu-component-navigation-menu/eu-component-navigation-menu.twig b/src/systems/eu/eu-component/eu-component-navigation/eu-component-navigation-menu/eu-component-navigation-menu.twig
index 367b3605df3..06225ae75f5 100644
--- a/src/systems/eu/eu-component/eu-component-navigation/eu-component-navigation-menu/eu-component-navigation-menu.twig
+++ b/src/systems/eu/eu-component/eu-component-navigation/eu-component-navigation-menu/eu-component-navigation-menu.twig
@@ -40,7 +40,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-navigation/eu-component-side-navigation/eu-component-side-navigation.twig b/src/systems/eu/eu-component/eu-component-navigation/eu-component-side-navigation/eu-component-side-navigation.twig
index 1298af46e9b..931f905e73f 100644
--- a/src/systems/eu/eu-component/eu-component-navigation/eu-component-side-navigation/eu-component-side-navigation.twig
+++ b/src/systems/eu/eu-component/eu-component-navigation/eu-component-side-navigation/eu-component-side-navigation.twig
@@ -40,7 +40,7 @@
 
 {% if extra_attributes is defined %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~'"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
diff --git a/src/systems/eu/eu-component/eu-component-profile-topbar/eu-component-profile-topbar.twig b/src/systems/eu/eu-component/eu-component-profile-topbar/eu-component-profile-topbar.twig
index 610623210ae..78b282ca6f1 100644
--- a/src/systems/eu/eu-component/eu-component-profile-topbar/eu-component-profile-topbar.twig
+++ b/src/systems/eu/eu-component/eu-component-profile-topbar/eu-component-profile-topbar.twig
@@ -37,7 +37,7 @@
 
 {% if extra_attributes is defined and extra_attributes is not empty and extra_attributes is iterable %}
   {% for attr in extra_attributes %}
-    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value ~ '"' %}
+    {% set _extra_attributes = _extra_attributes ~ ' ' ~ attr.name ~ '="' ~ attr.value|e ~'"' %}
   {% endfor %}
 {% endif %}
 
@@ -58,7 +58,7 @@
   <div
     {% if profile.expandable.expandable_body.extra_attributes is defined %}
       {% for attr in profile.expandable.expandable_body.extra_attributes %}
-        {% set attribute = attr.name ~ '="' ~ attr.value ~ '"' %}
+        {% set attribute = attr.name ~ '="' ~ attr.value|e ~'"' %}
         {{ attribute }}
       {% endfor %}
     {% endif %}