diff --git a/templates/eastings.html b/templates/eastings.html
index 1657ea1..a5ea9db 100644
--- a/templates/eastings.html
+++ b/templates/eastings.html
@@ -22,9 +22,22 @@ Coordinate systems in Austria are explained in:<br>
 <tr><th>Cave</th><th>Entrance</th><th>Easting</th><th>Northing</th><th>tag</th><th>tag exact</th><th>tag other</th><th>slug</th></tr>
 {% for ent in ents %}
 <tr>
-  <td style="text-align:left"><a href="/cave/{{ent.cached_primary_slug}}">
-  {% for c in ent.cavelist %}{{c.official_name|safe}}{% endfor %}</a></td>
-  <td style="text-align:left">{{ent.name|safe}}</td>
+  <td style="text-align:left">
+  {% for c in ent.cavelist %}
+    <a href="/{{c.url}}">
+    {% if c.official_name %}
+        {{c.official_name|safe}}
+    {% else %}
+        Unnamed: <em>{{c|safe}}</em>
+    {% endif %}</a><br>
+  {% endfor %}</td>
+  <td style="text-align:left">
+    {% if ent.name %}
+        {{ent.name|safe}}
+    {% else %}
+        Unnamed: <em>{{ent|safe}}</em>
+    {% endif %}
+  </td>
   <td style="text-align:right">{{ent.easting|floatformat:2}}</td>
   <td style="text-align:right">{{ent.northing|floatformat:2}}</td>
   <td style="text-align:right">{{ent.tag_station}}</td>