diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt
index fe9714278f..f25f3ed04f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt
@@ -4,12 +4,17 @@
 
 <channel>
  <title>[% shelfname %]</title>
- <link>[% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;viewshelf=[% shelfnumber | html %]</link>
+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;viewshelf=[% shelfnumber %]</link>
  <description>RSS feed for public list [% shelfname | html %]</description>
 
 [% FOREACH i IN itemsloop %]
  <item>
-  <title>[% i.title %] by [% i.author %]</title>
+  <title>
+    [% i.title | html %]
+    [% IF i.author %]
+        by [% i.author | html %]
+    [% END %]
+  </title>
   <link>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]</link>
  </item>
 [% END %]
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 ef2a32b624..5e623aa008 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -154,7 +154,7 @@
                         <h3>
                             [% shelfname |html %]
                             <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;viewshelf=[% shelfnumber | html %]" class="rss-list-link noprint">
-                                <img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/>
+                                <img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/>
                             </a>
                         </h3>