diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index c0d0ecddba..e4dce8561c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -77,7 +77,7 @@
                 [% ELSE %]
                     <h2 class="suppliername inactive">
                 [% END %]
-                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">
+                        <a id="vendor[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">
                             [% IF (supplier.name) %]
                                 [% supplier.name | html %]
                             [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index f86b39992a..6871a7e5dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -234,7 +234,7 @@
                                                 </td>
                                                 <td>
                                                     [% IF note.defined && note != '' %]
-                                                        <a name="viewnote" data-toggle="popover" title="Note" data-content="[% note | html %]" data-placement="top" data-trigger="hover">View note</a>
+                                                        <a id="viewnote" data-toggle="popover" title="Note" data-content="[% note | html %]" data-placement="top" data-trigger="hover">View note</a>
                                                     [% ELSE %]<span>&nbsp;</span>[% END %]
                                                 </td>
                                                 <td>
@@ -1465,7 +1465,7 @@
                     var current_column = $("#edit_row td:eq("+i+")");
                     if ( i == 3 ) {
                         // specific processing for the Note column
-                        var note = $(this).find("a[name='viewnote']").data("content");
+                        var note = $(this).find("a[id='viewnote']").data("content");
                         $(current_column).find("input[type='text']").val(note);
                     } else if ( i == 9 ) {
                         // specific processing for Hard due date
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
index 99897e7638..fd64c5358d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
@@ -76,7 +76,7 @@
 
                         [% IF ( mainloo.looptables ) %]
                             <div class="page-section">
-                                <h3><a name="summary" id="summary"></a>Summary</h3>
+                                <h3><a id="summary"></a>Summary</h3>
                                 <table id="summary_table">
                                     <tr>
                                         <th>Group</th>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index cca221a4e0..b49d4b6c78 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -89,6 +89,34 @@
         [% END %]
 
         [% IF koha_news.count %]
+            [% SET koha_news = AdditionalContents.get( category => 'news', location => ['opac_only', 'staff_and_opac'], lang => lang, news_id => news_id ) %]
+        [% ELSE %]
+            [% SET koha_news = AdditionalContents.get( category => 'news', location => ['opac_only', 'staff_and_opac'], lang => lang, library => branchcode ) %]
+        [% END %]
+        [% IF koha_news.content.count %]
+            <div id="news" class="newscontainer">
+                [% SET show_author = Koha.Preference('NewsAuthorDisplay') == 'opac' || Koha.Preference('NewsAuthorDisplay') == 'both' %]
+                [% FOREACH koha_new IN koha_news.content %]
+                    <div class="newsitem">
+                        <h4 class="newsheader">
+                            [% IF ( news_item ) %]
+                                [% koha_new.title | html %]
+                            [% ELSE %]
+                                <a id="newsitem[% koha_new.id | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.id | uri %]">[% koha_new.title | html %]</a>
+                            [% END %]
+                        </h4>
+                        <div class="newsbody">[% koha_new.content | $raw %]</div>
+                        <div class="newsfooter">
+                            Published on [% koha_new.published_on | $KohaDates %]
+                            [% IF ( show_author && koha_new.author ) %]
+                                by <span class="newsauthor">[% INCLUDE 'patron-title.inc' patron=koha_new.author %]</span>
+                            [% END %]
+                            [% IF ( news_id ) %]
+                                &bull; <a href="/cgi-bin/koha/opac-main.pl">Show all news</a>
+                            [% END %]
+                        </div>
+                    </div>
+                [% END %]
 
             [% IF single_news_error %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index c54c052fe3..6fb507b372 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -952,7 +952,7 @@
                                         <ol class="attributes_table">
                                             [% FOREACH pa IN pa_class.items %]
                                                 [% FOREACH pa_value IN pa.values %]
-                                                    [% IF loop.first %]<a name="patron-attr-start-[% pa.type.code | html %]"></a>[% END %]
+                                                    [% IF loop.first %]<a id="patron-attr-start-[% pa.type.code | html %]"></a>[% END %]
                                                     [% form_id = 'patron-attr-' _ Math.int( Math.rand(1000000) ) %]
                                                     <li data-category_code="[% pa.type.category_code | html %]">
                                                         [% IF pa.type.mandatory && pa.type.opac_editable %]