diff --git a/parsers/caves.py b/parsers/caves.py
index f568c8c..92eb0f0 100644
--- a/parsers/caves.py
+++ b/parsers/caves.py
@@ -49,10 +49,10 @@ def dummy_entrance(k, slug, msg="DUMMY"):
     if ent:
         ent.save() # must save to have id before foreign keys work.
         try: # Now create a entrance slug ID
-            es = EntranceSlug.objects.update_or_create(entrance = ent,
+            es = EntranceSlug(entrance = ent,
                       slug = slug, primary = False)
         except:
-            message = f" ! {k:11s}  {msg} entrance create failure"
+            message = f" ! {k:11s}  {msg}-{slug} entrance create failure"
             DataIssue.objects.create(parser='caves', message=message, url=f'{slug}')
             print(message)
 
@@ -75,11 +75,12 @@ def set_dummy_entrance(id, slug, cave, msg="DUMMY"):
         letter = ""
         entrances_xslug[slug] = entrance
         ce = CaveAndEntrance.objects.update_or_create(cave = cave, entrance_letter = "", entrance = entrance)
-        message = f' ! Warning: Dummy Entrance created for {id}'
+        message = f' ! Warning: Dummy Entrance successfully set for entrance {id} on cave {cave}'
         
         DataIssue.objects.create(parser='caves', message=message, url=f'{cave.url}')
         print(message)
     except:
+        #raise
         message = f' ! Entrance Dummy setting failure, slug:"{slug}" cave id :"{id}" '
         DataIssue.objects.create(parser='caves', message=message, url=f'{cave.url}')
         print(message)
diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml
index 8023ab8..0e5fc9b 100644
--- a/templates/dataformat/cave.xml
+++ b/templates/dataformat/cave.xml
@@ -11,8 +11,8 @@
 <cave>
 <non_public>{{ cave.non_public }}</non_public>{% for slug in cave.caveslug_set.all %}<!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
 <caveslug>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}<!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
-<official_name>{{ cave.official_name|default_if_none:""|safe }}</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->{% for area in cave.area.all %}<!-- Name of the cave (normally in German) -->
-<area>{{ area.short_name|default_if_none:""|safe }}</area>{% endfor %}<!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<official_name>{{ cave.official_name|default_if_none:""|safe }}</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+{% for area in cave.area.all %}<area>{{ area.short_name|default_if_none:""|safe }}</area>{% endfor %}<!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
 <kataster_code>{{ cave.kataster_code|default_if_none:""|safe }}</kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -29,7 +29,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>{{ cave.kataster_number|default_if_none:""|safe }}</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>{{ cave.unofficial_number|default_if_none:"2020-XX-01"|safe }}</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number>{{ cave.unofficial_number|default_if_none:"2022-XX-nn"|safe }}</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 {% for ce in cave.entrances.all %}
 <entrance>
   <entranceslug>{{ ce.entrance.slug|default_if_none:""|safe }}</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->