diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
index cc1abab4c1..fbe7760b8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
@@ -8,14 +8,14 @@
             <div id="checkin_search" class="residentsearch">
                 <p class="tip">Scan a barcode to check in:</p>
                 <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-                    <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
+                    <input type="text" name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
                     <input value="Submit" class="submit" type="submit" />
                 </form>
             </div>
             <div id="renew_search" class="residentsearch">
                 <p class="tip">Scan a barcode to renew:</p>
                 <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-                    <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+                    <input type="text" class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
                     <input value="Submit" class="submit" type="submit" />
                 </form>
             </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index a289b70527..206efb8188 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -16,14 +16,14 @@
         <div id="checkin_search" class="residentsearch">
             <p class="tip">Scan a barcode to check in:</p>
             <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-                <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" />
+                <input class="head-searchbox" type="text" name="barcode" id="ret_barcode" size="40" />
                 <input value="Submit" class="submit" type="submit" />
             </form>
         </div>
         <div id="renew_search" class="residentsearch">
         <p class="tip">Scan a barcode to renew:</p>
             <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+                <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" />
                 <input value="Submit" class="submit" type="submit" />
             </form>
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 0f4fc670f8..dc6035b660 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -8,7 +8,7 @@
 <div id="renew_search" class="residentsearch">
     <p class="tip">Scan a barcode to renew:</p>
     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+        <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
index efb8ccecd6..2a9a6be1bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
@@ -98,13 +98,13 @@
                                 <ol class="clearfix">
                                     <input type="hidden" name="club_template_field_id" value="[% f.id %]" />
                                     <li>
-                                        <label for="field-name-[% f.id %]">Name:</label>
-                                        <input name="club_template_field_name" id="field-name-[% f.id %]" value="[% f.name %]" />
+                                        <label for="field-name-[% f.id | html %]">Name:</label>
+                                        <input type="text" name="club_template_field_name" id="field-name-[% f.id | html %]" value="[% f.name | html %]" />
                                     </li>
 
                                     <li>
                                         <label for="field-description-[% f.id %]">Description:</label>
-                                        <input name="club_template_field_description" id="field-description-[% f.id %]" value="[% f.description %]" />
+                                        <input type="text" name="club_template_field_description" id="field-description-[% f.id | html %]" value="[% f.description | html %]" />
                                     </li>
 
                                     <li>
@@ -144,12 +144,12 @@
                                     <li>
                                         <input type="hidden" name="club_template_enrollment_field_id" value="[% f.id %]" />
                                         <label for="enrollment-field-name-[% f.id %]">Name:</label>
-                                        <input name="club_template_enrollment_field_name" id="enrollment-field-name-[% f.id %]" value="[% f.name %]" size="40" />
+                                        <input type="text" name="club_template_enrollment_field_name" id="enrollment-field-name-[% f.id %]" value="[% f.name %]" size="40" />
                                     </li>
 
                                     <li>
                                         <label for="enrollment-field-description-[% f.id %]">Description:</label>
-                                        <input name="club_template_enrollment_field_description" id="enrollment-field-description-[% f.id %]" value="[% f.description %]" size="40" />
+                                        <input type="text" name="club_template_enrollment_field_description" id="enrollment-field-description-[% f.id %]" value="[% f.description %]" size="40" />
                                     </li>
 
                                     <li>
@@ -193,12 +193,12 @@
 
         <li>
             <label for="club_template_field_name">Name:</label>
-            <input name="club_template_field_name" />
+            <input type="text" name="club_template_field_name" />
         </li>
 
         <li>
             <label for="club_template_field_description">Description:</label>
-            <input name="club_template_field_description" />
+            <input type="text" name="club_template_field_description" />
         </li>
 
         <li>
@@ -220,12 +220,12 @@
 
         <li>
             <label for="club_template_enrollment_field_name">Name:</label>
-            <input name="club_template_enrollment_field_name" />
+            <input type="text" name="club_template_enrollment_field_name" />
         </li>
 
         <li>
             <label for="club_template_enrollment_field_description">Description:</label>
-            <input name="club_template_enrollment_field_description" />
+            <input type="text" name="club_template_enrollment_field_description" />
         </li>
 
         <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
index ccd899a141..7ed9f8505c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
@@ -146,7 +146,7 @@
                                                 [% END %]
                                             </select>
                                         [% ELSE %]
-                                            <input id="field_[% field.id %]" name="field_[% field.id %]" placeholder="No change"/>
+                                            <input type="text" id="field_[% field.id | html %]" name="field_[% field.id | html %]" placeholder="No change"/>
                                         [% END %]
                                     </li>
                                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
index 77b5b194bb..91172200b8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
@@ -52,7 +52,7 @@
                                 [% IF ( TagsInputEnabled && loggedinusername ) %]
                                 <span id="tagsel_form" style="display:none">
                                     <label for="tagsel_new">New tag:</label>
-                                    <input name="tagsel_new" id="tagsel_new" maxlength="100" />
+                                    <input type="text" name="tagsel_new" id="tagsel_new" maxlength="100" />
                                     <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="Add" type="submit" value="Add">
                                     <a href="#" id="tagsel_cancel">Cancel</a>
                                 </span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 4b13a3a12f..f8537bd10a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -260,14 +260,14 @@
                                                         [% IF ( reserve_in_future ) %]
                                                             <li>
                                                                 <label for="from[% bibitemloo.biblionumber %]">Hold starts on date:</label>
-                                                                <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from[% bibitemloo.biblionumber %]" size="10" class="holddatefrom"/>
+                                                                <input type="text" name="reserve_date_[% bibitemloo.biblionumber %]" id="from[% bibitemloo.biblionumber %]" size="10" class="holddatefrom"/>
                                                                 <span class="date-format from" data-biblionumber="[% bibitemloo.biblionumber %]">[% INCLUDE 'date-format.inc' %]</span>
                                                             </li>
                                                         [% END %]
 
                                                         <li>
                                                             <label for="to[% bibitemloo.biblionumber %]">Hold not needed after:</label>
-                                                            <input name="expiration_date_[% bibitemloo.biblionumber %]" id="to[% bibitemloo.biblionumber %]" size="10" class="holddateto" />
+                                                            <input type="text" name="expiration_date_[% bibitemloo.biblionumber %]" id="to[% bibitemloo.biblionumber %]" size="10" class="holddateto" />
                                                             <span class="date-format to" data-biblionumber="[% bibitemloo.biblionumber %]">[% INCLUDE 'date-format.inc' %]</span>
                                                         </li>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 4dd2a05b07..375f56afeb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -168,7 +168,7 @@
                                                 </span>
                                                 <div id="tagsel_form" style="display:none">
                                                     <label for="tagsel_new">New tag:</label>
-                                                    <input name="tagsel_new" id="tagsel_new" maxlength="100" />
+                                                    <input type="text" name="tagsel_new" id="tagsel_new" maxlength="100" />
                                                     <input id="tagsel_button" name="tagsel_button" class="tagsel_button btn btn-small" title="Add" type="submit" value="Add" />
                                                     <a href="#" id="tagsel_cancel">(done)</a>
                                                 </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index 6b0fc07d27..52249dd8dc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -55,7 +55,7 @@
             <li><label for="name">List name:</label> [% shelfname | html %]</li>
             <li>
                 <label for="invite_address">Email address:</label>
-                <input id="invite_address" name="invite_address" size="40" />
+                <input type="text" id="invite_address" name="invite_address" size="40" />
             </li>
             </ol>
         </fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 1d992140a6..8e227a12d5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -263,7 +263,7 @@
                                         </span>
                                         <span id="tagsel_form" style="display:none">
                                           <label for="tagsel_new">New tag(s), separated by a comma:</label>
-                                          <input name="tagsel_new" id="tagsel_new" maxlength="100" />
+                                          <input type="text" name="tagsel_new" id="tagsel_new" maxlength="100" />
                                           <input id="tagsel_button" name="tagsel_button" class="tagsel_button btn btn-small" title="tagsel_button" type="submit" value="Add" />
                                           <a href="#" id="tagsel_cancel">Cancel</a>
                                         </span>
@@ -449,9 +449,10 @@
                                                                 <span class="actions"><a class="tag_add hidden" id="tag_add[% itemsloo.biblionumber %]" href="#">Add tag</a></span>
                                                                 <div id="tagform[% itemsloo.biblionumber %]" class="tag_results_input" style="display:none;">
                                                                     <label for="newtag[% itemsloo.biblionumber %]">New tag(s), separated by a comma:</label>
-                                                                    <input name="newtag[% itemsloo.biblionumber %]" id="newtag[% itemsloo.biblionumber %]" maxlength="100" />
+                                                                    <input type="text" name="newtag[% itemsloo.biblionumber %]" id="newtag[% itemsloo.biblionumber %]" maxlength="100" />
                                                                     <input name="tagbutton" class="tagbutton btn btn-small" title="[% itemsloo.biblionumber %]" type="submit" value="Add" />
                                                                     <a class="cancel_tag_add" id="cancel[% itemsloo.biblionumber %]" href="#">(done)</a>
+
                                                                 </div>
                                                                 <div id="newtag[% itemsloo.biblionumber %]_status" class="tagstatus" style="display:none;">
                                                                 Tag status here.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 487c706e19..6866f50e39 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -719,7 +719,7 @@
                                                                         <div class="modal-body">
                                                                             <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
                                                                             <label for="suspend_until_[% RESERVE.reserve_id %]">Suspend until:</label>
-                                                                            <input name="suspend_until" id="suspend_until_[% RESERVE.reserve_id %]" class="suspend-until" size="10" />
+                                                                            <input type="text" name="suspend_until" id="suspend_until_[% RESERVE.reserve_id %]" class="suspend-until" size="10" />
                                                                             [% INCLUDE 'date-format.inc' %]
                                                                             <p class="js-show"><a href="#" onclick="document.getElementById('suspend_until_[% RESERVE.reserve_id %]').value='';return false;">Clear date to suspend indefinitely</a></p>
                                                                             <button class="btn btn-mini js-hide" type="submit" name="submit">Suspend</button>
@@ -761,7 +761,7 @@
 
                                         [% IF AutoResumeSuspendedHolds %]
                                             <label for="suspend_until"> until </label>
-                                            <input name="suspend_until" id="suspend_until" class="suspend-until" readonly="readonly" size="10" />
+                                            <input type="text" name="suspend_until" id="suspend_until" class="suspend-until" readonly="readonly" size="10" />
                                             <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear date to suspend indefinitely</a>
                                         [% END %]
                                     </form>