diff --git a/troggle/templates/calendar.html b/troggle/templates/calendar.html
index 70d3ecf0a..b4ad49db5 100644
--- a/troggle/templates/calendar.html
+++ b/troggle/templates/calendar.html
@@ -49,13 +49,13 @@
                       <td class="name">
                           {{ personexpedition.person }}
                       </td>
+                      {% if personexpedition.ListDaysTF %}
                       {% for dateTF in personexpedition.ListDaysTF %}
                       		<td {{ dateTF|yesno:"class='yes',class='no'"|safe }}></td>
-                      {% empty %}
-                      		<td colspan="{{ expedition.ListDays|length }}"><center>No data.</center></td>
                       {% endfor %}
-
-                    
+                      {% else %}
+                      		<td colspan="{{ expedition.ListDays|length }}"><center>No data.</center></td>
+                      {% endif %}
                  </tr>
             {% endfor %}
 	    </table>
diff --git a/troggle/templates/caveindex.html b/troggle/templates/caveindex.html
index 8b9ef3791..d97aff8cb 100644
--- a/troggle/templates/caveindex.html
+++ b/troggle/templates/caveindex.html
@@ -5,6 +5,6 @@
 
 {% block content %}
 {% for cave in caves %}
-<p>{{ cave }} <a href="{{settings.URL_ROOT}}{{ cave.kataster_number }}/">{{ cave.official_name|wiki_to_html_short }}</a> </p>
+<p>{{ cave }} <a href="{{settings.URL_ROOT}}cave/{{ cave.kataster_number }}/">{{ cave.official_name|wiki_to_html_short }}</a> </p>
 {% endfor %}
 {% endblock %}
\ No newline at end of file