diff --git a/classes/output/formulation_and_controls.php b/classes/output/formulation_and_controls.php
index e06da0b..9962221 100644
--- a/classes/output/formulation_and_controls.php
+++ b/classes/output/formulation_and_controls.php
@@ -74,8 +74,8 @@ public function export_for_template(renderer_base $output) {
                 $cellcontext['colindex'] = $colindex;
                 $cellcontext['responseparamname'] = $responseparamname;
                 $a = [
-                    'itemshorttext' => $row->shorttext,
-                    'answershorttext' => $col->shorttext
+                    'itemshorttext' => strip_tags($row->shorttext),
+                    'answershorttext' => strip_tags($col->shorttext)
                 ];
                 $cellcontext['arialabel'] = lang::get('cellarialabel', (object) $a);
 
diff --git a/templates/question.mustache b/templates/question.mustache
index 6ec7cee..b8fe579 100644
--- a/templates/question.mustache
+++ b/templates/question.mustache
@@ -130,10 +130,10 @@ Expired question: This can happen in preview mode.
 {{#cells}}
         <td class="cell {{ cellclass }}">
 {{#multiple}}
-            <input type="checkbox" name="{{ responseparamname }}" value="1"{{#isreadonly}} disabled="disabled"{{/isreadonly}}{{#ischecked}} checked="checked"{{/ischecked}} aria-label="{{{ arialabel }}}">
+            <input type="checkbox" name="{{ responseparamname }}" value="1"{{#isreadonly}} disabled="disabled"{{/isreadonly}}{{#ischecked}} checked="checked"{{/ischecked}} aria-label="{{ arialabel }}">
 {{/multiple}}
 {{^multiple}}
-            <input type="radio" name="{{ formfieldname }}" value="{{ colindex }}"{{#isreadonly}} disabled="disabled"{{/isreadonly}}{{#ischecked}} checked="checked"{{/ischecked}} aria-label="{{{ arialabel }}}">
+            <input type="radio" name="{{ formfieldname }}" value="{{ colindex }}"{{#isreadonly}} disabled="disabled"{{/isreadonly}}{{#ischecked}} checked="checked"{{/ischecked}} aria-label="{{ arialabel }}">
             <input hidden type="checkbox" id="{{ uniqid }}_{{ cellclass }}" name="{{ responseparamname }}" value="1"{{#ischecked}} checked="checked"{{/ischecked}} aria-hidden="true">
             <label hidden for="{{ uniqid }}_{{ cellclass }}">{{ cellclass }}</label>
 {{/multiple}}