diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml
index c1ad01b..8023ab8 100644
--- a/templates/dataformat/cave.xml
+++ b/templates/dataformat/cave.xml
@@ -1,7 +1,7 @@
-
+
@@ -9,33 +9,47 @@
-{{ cave.non_public }}{% for slug in cave.caveslug_set.all %}
-{{ slug.slug|default_if_none:"1623-000"|safe }}{% endfor %}
-{{ cave.official_name|default_if_none:""|safe }}{% for area in cave.area.all %}
-{{ area.short_name|default_if_none:""|safe }}{% endfor %}
-{{ cave.kataster_code|default_if_none:""|safe }}
-{{ cave.kataster_number|default_if_none:""|safe }}
-{{ cave.unofficial_number|default_if_none:"2020-XX-01"|safe }}
+{{ cave.non_public }}{% for slug in cave.caveslug_set.all %}
+{{ slug.slug|default_if_none:"1623-000"|safe }}{% endfor %}
+{{ cave.official_name|default_if_none:""|safe }}{% for area in cave.area.all %}
+{{ area.short_name|default_if_none:""|safe }}{% endfor %}
+{{ cave.kataster_code|default_if_none:""|safe }}
+{{ cave.kataster_number|default_if_none:""|safe }}
+{{ cave.unofficial_number|default_if_none:"2020-XX-01"|safe }}
{% for ce in cave.entrances.all %}
- {{ ce.entrance.slug|default_if_none:""|safe }}
- {{ ce.entrance_letter|default_if_none:""|safe }}
+ {{ ce.entrance.slug|default_if_none:""|safe }}
+ {{ ce.entrance_letter|default_if_none:""|safe }}
{% endfor %}
-{{ cave.explorers|default_if_none:""|safe }}
-{{ cave.underground_description|default_if_none:""|safe }}
-{{ cave.equipment|default_if_none:""|safe }}
+{{ cave.explorers|default_if_none:""|safe }}
+{{ cave.underground_description|default_if_none:""|safe }}
+{{ cave.equipment|default_if_none:""|safe }}
{{ cave.references|default_if_none:""|safe }}
{{ cave.survey|default_if_none:""|safe }}
{{ cave.kataster_status|default_if_none:""|safe }}
-{{ cave.underground_centre_line|default_if_none:""|safe }}
+{{ cave.underground_centre_line|default_if_none:""|safe }}
{{ cave.notes|default_if_none:""|safe }}
-{{ cave.length|default_if_none:""|safe }}
-{{ cave.depth|default_if_none:""|safe }}
+{{ cave.length|default_if_none:""|safe }}
+{{ cave.depth|default_if_none:""|safe }}
{{cave.extent|default_if_none:""|safe }}
-{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}
-{{ cave.description_file|default_if_none:""|safe }}
-{{ cave.url|default_if_none:"1623/000"|safe }}
+{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}
+{{ cave.description_file|default_if_none:""|safe }}
+{{ cave.url|default_if_none:"1623/000"|safe }}