diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc
index 41771a8fc1..7b2bab777d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc
@@ -1,11 +1,11 @@
[% USE AuthorisedValues %]
[% FOR field IN available %]
- [% field.name %]:
+ [% field.name | html %]:
[% IF field.authorised_value_category %]
- [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) %]
+ [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) | html %]
[% ELSE %]
- [% values.${field.name} %]
+ [% values.${field.name} | html %]
[% END %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
index c8cbd83bcd..d20b7c5b80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
@@ -6,24 +6,24 @@
[% END %]
[% FOR field IN available %]
-
+
[% IF field.authorised_value_category %]
- (Authorised values for [% field.authorised_value_category | html %])
[% ELSE %]
[% IF field.marcfield %]
-
- This value will be filled with the [% field.marcfield %] subfield of the selected biblio.
+
+ This value will be filled with the [% field.marcfield | html %] subfield of the selected biblio.
[% ELSE %]
-
+
[% END %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
index bdd6984be5..1d85a8e845 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -1,15 +1,16 @@
+[% USE raw %]
[% USE Asset %]
[% USE AuthorisedValues %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration ›
[% SWITCH op %]
- [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name %]'[% ELSE %]Add additional field[% END %]
+ [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %]
[% CASE %]Manage additional fields
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css('css/datatables.css') %]
+[% Asset.css('css/datatables.css') | $raw %]
[% marcfield_tables = ['subscription'] %]
@@ -22,8 +23,8 @@
Home › Administration ›
[% SWITCH op %]
- [% CASE 'add_form' %]Manage additional fields › [% IF field %]Modify field '[% field.name %]'[% ELSE %]Add field[% END %]
- [% CASE 'list' %]Manage additional fields › Modify fields for '[% tablename %]'
+ [% CASE 'add_form' %]Manage additional fields › [% IF field %]Modify field '[% field.name | html %]'[% ELSE %]Add field[% END %]
+ [% CASE 'list' %]Manage additional fields › Modify fields for '[% tablename | html %]'
[% CASE %]Manage additional fields
[% END %]