diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 753db662..4fa37a1d 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -15,7 +15,7 @@
       <h2>{{entry.title}}</h2>
       <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('author', name=author.name | urlencode) }}">{{author.name}}</a>
+            <a href="{{url_for('author', id=author.id ) }}">{{author.name}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
@@ -37,7 +37,7 @@
       {% endif %}
 
       {% if entry.series|length > 0 %}
-        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('series', name=entry.series[0].name)}}">{{entry.series[0].name}}</a></p>
+        <p>{{_('Book')}} {{entry.series_index}} {{_('of')}} <a href="{{url_for('series', id=entry.series[0].id)}}">{{entry.series[0].name}}</a></p>
       {% endif %}
 
       {% if entry.languages.__len__() > 0 %}
@@ -58,20 +58,21 @@
       </p>
       {% endif %}
 
-
       {% if entry.tags|length > 0 %}
       <p>
       <div class="tags">
         <span class="glyphicon glyphicon-tags"></span>
         
         {% for tag in entry.tags %}
-          <a href="{{ url_for('category', name=tag.name | urlencode) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
+          <a href="{{ url_for('category', id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
         {%endfor%}
 
       </div>
       </p>
       {% endif %}
-      
+      {% if entry.pubdate != '0101-01-01 00:00:00' %}
+        <p>{{_('Publishing date')}}: {{entry.pubdate[:10]}} </p>
+      {% endif %}
       {% if cc|length > 0 %}
         <p>
         <div class="custom_columns">
@@ -101,7 +102,7 @@
       {% endif %}  
         
 
-      {% if entry.comments|length > 0 %}
+      {% if entry.comments|length > 0 and entry.comments[0].text|length > 0%}
         <h3>{{_('Description:')}}</h3>
         {{entry.comments[0].text|safe}}
       {% endif %}