diff --git a/cps/templates/json.txt b/cps/templates/json.txt
index b724f4e9..9e86c41d 100644
--- a/cps/templates/json.txt
+++ b/cps/templates/json.txt
@@ -16,7 +16,7 @@
   {% endfor %}    
   ], 
   "series": null, 
-  "cover": "/opds/cover/{{entry.id}}", 
+  "cover": "{{url_for('feed_get_cover', book_id=entry.id)}}",
   "languages": [
   {% for lang in entry.languages %}  
     "{{lang.lang_code}}"{% if not loop.last %},{% endif %}
@@ -34,9 +34,9 @@
   "author_sort": "{{entry.author_sort}}", 
   "uuid": "{{entry.uuid}}", 
   "timestamp": "{{entry.timestamp}}", 
-  "thumbnail": "/opds/cover/{{entry.id}}", 
+  "thumbnail": "{{url_for('feed_get_cover', book_id=entry.id)}}",
   "main_format": {
-    "{{entry.data[0].format|lower}}": "/download/{{entry.id}}/{{entry.data[0].format|lower}}"
+    "{{entry.data[0].format|lower}}": "{{ url_for('get_opds_download_link', book_id=entry.id, format=entry.data[0].format|lower)}}"
   },
   "rating":{% if entry.ratings.__len__() > 0 %} "{{entry.ratings[0].rating}}.0"{% else %}0.0{% endif %},
   "authors": [
@@ -47,7 +47,7 @@
   "other_formats": {
   {% if entry.data.__len__() > 1 %}
   {% for format in entry.data[1:] %}
-    "{{format.format|lower}}": "/download/{{entry.id}}/{{format.format|lower}}"{% if not loop.last %},{% endif %}
+    "{{format.format|lower}}": "{{ url_for('get_opds_download_link', book_id=entry.id, format=format.format|lower)}}"{% if not loop.last %},{% endif %}
   {% endfor %}
   {% endif %} },
   "title_sort": "{{entry.sort}}"
diff --git a/cps/templates/osd.xml b/cps/templates/osd.xml
index bbc227c4..1d943981 100644
--- a/cps/templates/osd.xml
+++ b/cps/templates/osd.xml
@@ -8,7 +8,7 @@
    <Url type="text/html"
         template="{{url_for('search')}}?query={searchTerms}"/>
    <Url type="application/atom+xml"
-        template="{{url_for('feed_search')}}?query={searchTerms}"/>
+        template="{{url_for('feed_normal_search')}}?query={searchTerms}"/>
    <SyndicationRight>open</SyndicationRight>
    <Language>de-DE</Language>
    <OutputEncoding>UTF-8</OutputEncoding>