diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 82e92416..428dd363 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -27,7 +27,10 @@
         href="{{request.script_root + request.path}}?offset={{ pagination.previous_offset }}"
         type="application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"/>
 {% endif %}
-  <link title="{{_('Search')}}" type="application/atom+xml" href="{{url_for('feed_normal_search')}}?query={searchTerms}" rel="search"/>
+    <link rel="search"
+      href="{{url_for('feed_osd')}}"
+      type="application/opensearchdescription+xml"/>
+  <!--link title="{{_('Search')}}" type="application/atom+xml" href="{{url_for('feed_normal_search')}}?query={searchTerms}" rel="search"/-->
   <title>{{instance}}</title>
   <author>
     <name>{{instance}}</name>
@@ -43,9 +46,12 @@
     <author>
       <name>{{entry.authors[0].name}}</name>
     </author>
-    <publisher>
-      <name>{{entry.publishers[0].name}}</name>
-    </publisher>
+
+    {% if publishers.__len__() > 0 %}
+      <publisher>
+        <name>{{entry.publishers[0].name}}</name>
+      </publisher>
+    {% endif %}
     <dcterms:language>{{entry.language}}</dcterms:language>
     {% for tag in entry.tags %}
     <category scheme="http://www.bisg.org/standards/bisac_subject/index.html"
diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index 18f90581..7ab305aa 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -5,7 +5,10 @@
   <link rel="self" href="{{url_for('feed_index')}}" type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
   <link rel="start" title="{{_('Start')}}" href="{{url_for('feed_index')}}"
         type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <link title="{{_('Search')}}" type="application/opensearchdescription+xml" href="{{url_for('feed_normal_search')}}?query={searchTerms}" rel="search"/>
+  <link rel="search"
+      href="{{url_for('feed_osd')}}"
+      type="application/opensearchdescription+xml"/>
+  <!--link title="{{_('Search')}}" type="application/atom+xml" href="{{url_for('feed_normal_search')}}?query={searchTerms}" rel="search"/-->
   <title>{{instance}}</title>
   <author>
     <name>{{instance}}</name>