diff --git a/templates/personwallets.html b/templates/personwallets.html
index dd1ae20..e840563 100644
--- a/templates/personwallets.html
+++ b/templates/personwallets.html
@@ -28,7 +28,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     <td style="padding:2px" >{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td>
     <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td>
     <td style="padding:2px">{{wallet.persons}}</td>
-    <td style="padding:2px">{{wallet.cave}}</td>
+    <td style="padding:2px">{% if wallet.cave %}{{wallet.cave}}{% else %} {% endif %}</td>
     
     <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td>
     <td style="padding:2px">
diff --git a/templates/wallet_table.html b/templates/wallet_table.html
index 1dedb3b..bad144a 100644
--- a/templates/wallet_table.html
+++ b/templates/wallet_table.html
@@ -21,9 +21,9 @@
   <tr>
     <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td>
     
-    <td style="padding:2px" >{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td>
-    <td style="padding:2px">{{wallet.cave}}</td>
-    <td style="padding:2px">{{wallet.name}}</td>
+    <td style="padding:2px">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td>
+    <td style="padding:2px">{% if wallet.cave %}{{wallet.cave}}{% else %} {% endif %}</td>
+    <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td>
     
     <td style="padding:1px; background-color:{{wallet.ticks.S}}">&nbsp;</td>
     <td style="padding:1px; background-color:{{wallet.ticks.C}}">&nbsp;</td>
diff --git a/templates/yearwallets.html b/templates/yearwallets.html
index 3036ccc..bce04d7 100644
--- a/templates/yearwallets.html
+++ b/templates/yearwallets.html
@@ -28,7 +28,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     <td style="padding:2px">{% if wallet.date %}{{wallet.date}}{% else %} {% endif %}</td>
     <td style="padding:2px">{% if wallet.name %}{{wallet.name}}{% else %} {% endif %}</td>
     <td style="padding:2px">{{wallet.persons}}</td>
-    <td style="padding:2px">{{wallet.cave}}</td>
+    <td style="padding:2px">{% if wallet.cave %}{{wallet.cave}}{% else %} {% endif %}</td>
     
     <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td>
     <td style="padding:2px">