diff --git a/cave_data/1623-2005-91.html b/cave_data/1623-2005-91.html
index 37957bfbc..41427e0cb 100644
--- a/cave_data/1623-2005-91.html
+++ b/cave_data/1623-2005-91.html
@@ -1,17 +1,25 @@
 <!DOCTYPE html>
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
 <cave>
 <non_public>False</non_public>
-<caveslug>1623-2005-91</caveslug>
+
 <official_name></official_name>
 <area>1623</area>
-<area>1d</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2005-91</unofficial_number>
@@ -22,19 +30,17 @@
 </entrance>
 
 <explorers>CUCC 2004 (OllyB and Jenny)</explorers>
+<survex_file></survex_file>
 <underground_description></underground_description>
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
 <notes></notes>
 <length></length>
 <depth></depth>
 <extent></extent>
-<survex_file></survex_file>
+
 <description_file></description_file>
-<url>1623/2005-91/2005-91.html</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2007-02.html b/cave_data/1623-2007-02.html
index c1a7555c1..56640caa1 100644
--- a/cave_data/1623-2007-02.html
+++ b/cave_data/1623-2007-02.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:14 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:14 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2007-02</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2007-02</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2007-02</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2007-02</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 -->
-  <!-- DEBUG  1623-2007-02+1623-2007-02 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2007-02</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>CUCC 2007 (found)</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references><a href="/years/2007/logbook.html#t2007-07-19A">Logbook 2007</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>CUCC 2007 (found)</explorers>
+<survex_file></survex_file>
+<underground_description></underground_description>
+<equipment></equipment>
+<references><a href="/years/2007/logbook.html#t2007-07-19A">Logbook 2007</a></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2007-02/2007-02.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2022-HH-01.html b/cave_data/1623-2022-HH-01.html
index 2cbcb9398..b84d3cf8f 100644
--- a/cave_data/1623-2022-HH-01.html
+++ b/cave_data/1623-2022-HH-01.html
@@ -1,65 +1,47 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 5, 2023, 10:46 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 5, 2023, 10:46 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2022-HH-01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2022-HH-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2022-HH-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2022-HH-01a</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 -->
-  <!-- DEBUG  1623-2022-HH-01+1623-2022-HH-01a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2022-HH-01a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
 <explorers>Prospecting, Harry and Hannah
-<a href="/logbookentry/2022-08-01/2022-08-01b">logbook 1st Aug 2022</a></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Just off top camp-fish face path. Snow plug, no draft</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<a href="/logbookentry/2022-08-01/2022-08-01b">logbook 1st Aug 2022</a></explorers>
+<survex_file></survex_file>
+<underground_description>Just off top camp-fish face path. Snow plug, no draft</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2022-HH-01.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-01.html b/cave_data/1623-2023-ASH-01.html
index 071c7282d..d64bb767a 100644
--- a/cave_data/1623-2023-ASH-01.html
+++ b/cave_data/1623-2023-ASH-01.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-01a</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 -->
-  <!-- DEBUG  1623-2023-ASH-01+1623-2023-ASH-01a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-01a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Janis, Ely</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes>This cave has not been dropped yet.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Janis, Ely</explorers>
+<survex_file></survex_file>
+<underground_description></underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes>This cave has not been dropped yet.</notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-01/2023-ASH-01.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-02.html b/cave_data/1623-2023-ASH-02.html
index 5c7457266..c97ceb215 100644
--- a/cave_data/1623-2023-ASH-02.html
+++ b/cave_data/1623-2023-ASH-02.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-02</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-02</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-02</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-02a</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 -->
-  <!-- DEBUG  1623-2023-ASH-02+1623-2023-ASH-02a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-02a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Cave not yet dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers></explorers>
+<survex_file></survex_file>
+<underground_description>Cave not yet dropped</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-02/2023-ASH-02.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-03.html b/cave_data/1623-2023-ASH-03.html
index 0f40aa205..58b309f23 100644
--- a/cave_data/1623-2023-ASH-03.html
+++ b/cave_data/1623-2023-ASH-03.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-03</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-03</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-03</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-03a</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 -->
-  <!-- DEBUG  1623-2023-ASH-03+1623-2023-ASH-03a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-03a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Janis, Ely</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Cave not yet dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Janis, Ely</explorers>
+<survex_file></survex_file>
+<underground_description>Cave not yet dropped</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-03/2023-ASH-03.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-04.html b/cave_data/1623-2023-ASH-04.html
index dafdd68c1..b30182597 100644
--- a/cave_data/1623-2023-ASH-04.html
+++ b/cave_data/1623-2023-ASH-04.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-04</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-04</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-04</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-04a</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 -->
-  <!-- DEBUG  1623-2023-ASH-04+1623-2023-ASH-04a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-04a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Janis, Ely</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Cave not yet dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Janis, Ely</explorers>
+<survex_file></survex_file>
+<underground_description>Cave not yet dropped</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-04/2023-ASH-04.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-06.html b/cave_data/1623-2023-ASH-06.html
index 8655c4ce7..8a8aac2ce 100644
--- a/cave_data/1623-2023-ASH-06.html
+++ b/cave_data/1623-2023-ASH-06.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-06</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-06</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-06</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-06a</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 -->
-  <!-- DEBUG  1623-2023-ASH-06+1623-2023-ASH-06a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-06a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Cave not yet dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>Cave not yet dropped</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-06/2023-ASH-06.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-07.html b/cave_data/1623-2023-ASH-07.html
index 0155bec26..c1ad3b531 100644
--- a/cave_data/1623-2023-ASH-07.html
+++ b/cave_data/1623-2023-ASH-07.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-07</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-07</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-07</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-07a</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 -->
-  <!-- DEBUG  1623-2023-ASH-07+1623-2023-ASH-07a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-07a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Cave not yet dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>Cave not yet dropped</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-07/2023-ASH-07.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-10.html b/cave_data/1623-2023-ASH-10.html
index 4bc789ad0..b466412e6 100644
--- a/cave_data/1623-2023-ASH-10.html
+++ b/cave_data/1623-2023-ASH-10.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-10</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-10</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-10</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-10a</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 -->
-  <!-- DEBUG  1623-2023-ASH-10+1623-2023-ASH-10a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-10a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>This cave has not yet been dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>rope required</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>This cave has not yet been dropped</underground_description>
+<equipment>rope required</equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-10/2023-ASH-10.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-11.html b/cave_data/1623-2023-ASH-11.html
index 79d737fce..f29f2192b 100644
--- a/cave_data/1623-2023-ASH-11.html
+++ b/cave_data/1623-2023-ASH-11.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-11</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-11</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-11</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-11a</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 -->
-  <!-- DEBUG  1623-2023-ASH-11+1623-2023-ASH-11a 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-11a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Cave not yet dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>rope required</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>Cave not yet dropped</underground_description>
+<equipment>rope required</equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-11/2023-ASH-11.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-12.html b/cave_data/1623-2023-ASH-12.html
index 17d2e455e..94a2290ed 100644
--- a/cave_data/1623-2023-ASH-12.html
+++ b/cave_data/1623-2023-ASH-12.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-12</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-12</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-12</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-12</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 -->
-  <!-- DEBUG  1623-2023-ASH-12+1623-2023-ASH-12 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-12</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>This cave has not yet been dropped.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>rope required</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>This cave has not yet been dropped.</underground_description>
+<equipment>rope required</equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-12/2023-ASH-12.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-13.html b/cave_data/1623-2023-ASH-13.html
index 45bc1c56a..b44c52829 100644
--- a/cave_data/1623-2023-ASH-13.html
+++ b/cave_data/1623-2023-ASH-13.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-13</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-13</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-13</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-13</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 -->
-  <!-- DEBUG  1623-2023-ASH-13+1623-2023-ASH-13 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-13</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>This cave has not yet been dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>rope required</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>This cave has not yet been dropped</underground_description>
+<equipment>rope required</equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-13/2023-ASH-13.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-ASH-14.html b/cave_data/1623-2023-ASH-14.html
index 79f53b1c2..c228cdb1a 100644
--- a/cave_data/1623-2023-ASH-14.html
+++ b/cave_data/1623-2023-ASH-14.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-ASH-14</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ASH-14</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ASH-14</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-14</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 -->
-  <!-- DEBUG  1623-2023-ASH-14+1623-2023-ASH-14 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-ASH-14</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Ash, Evelyn</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>This cave has not yet been dropped</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>rope required</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ash, Evelyn</explorers>
+<survex_file></survex_file>
+<underground_description>This cave has not yet been dropped</underground_description>
+<equipment>rope required</equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-ASH-14/2023-ASH-14.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-BL-11.html b/cave_data/1623-2023-BL-11.html
index 542f439e2..9d2b41d6d 100644
--- a/cave_data/1623-2023-BL-11.html
+++ b/cave_data/1623-2023-BL-11.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-BL-11</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-BL-11</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-BL-11</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-BL-11</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 -->
-  <!-- DEBUG  1623-2023-BL-11+1623-2023-BL-11 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-BL-11</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Found 7 Aug 2017 (recorded as GPS waypoint 078) and tagged, but tag not found by team in 2023 who rediscovered it. Logbook trip <a href="/logbookentry/2017-08-07/2017-08-07b">Prospecting beyond FGH and GSH</a></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references>Wallet 2023#64</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey><a href='/1623/2023-BL-11/l/2023-BL-11-sketch.html'><img src='/1623/2023-BL-11/t/2023-BL-11-sketch.jpg' /></a></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Found 7 Aug 2017 (recorded as GPS waypoint 078) and tagged, but tag not found by team in 2023 who rediscovered it. Logbook trip <a href="/logbookentry/2017-08-07/2017-08-07b">Prospecting beyond FGH and GSH</a></explorers>
+<survex_file></survex_file>
+<underground_description></underground_description>
+<equipment></equipment>
+<references>Wallet 2023#64</references>
+<survey><a href='/1623/2023-BL-11/l/2023-BL-11-sketch.html'><img src='/1623/2023-BL-11/t/2023-BL-11-sketch.jpg' /></a></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-BL-11/2023-BL-11.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-EBH-01.html b/cave_data/1623-2023-EBH-01.html
index bb664e3ac..877a43ef0 100644
--- a/cave_data/1623-2023-EBH-01.html
+++ b/cave_data/1623-2023-EBH-01.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 10:40 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:40 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-EBH-01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-EBH-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-EBH-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-EBH-01</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 -->
-  <!-- DEBUG  1623-2023-EBH-01+1623-2023-EBH-01 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-EBH-01</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Ely Brookes-Hefetz, James Waite, Martin Green, Zach Woodford</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>6m rift with potential undercut leading on.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey>See Wallet 2023#12</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ely Brookes-Hefetz, James Waite, Martin Green, Zach Woodford</explorers>
+<survex_file></survex_file>
+<underground_description>6m rift with potential undercut leading on.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey>See Wallet 2023#12</survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-EBH-01/2023-EBH-01.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-EBH-02.html b/cave_data/1623-2023-EBH-02.html
index 096c29b60..488b76ae5 100644
--- a/cave_data/1623-2023-EBH-02.html
+++ b/cave_data/1623-2023-EBH-02.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 10:22 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:22 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-EBH-02</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-EBH-02</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-EBH-02</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-EBH-02</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 -->
-  <!-- DEBUG  1623-2023-EBH-02+1623-2023-EBH-02 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-EBH-02</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Ely Brookes-Hefetz, James Waite, Martin Green, Zach Woodford</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Narrow shaft leading straight down, potential turn at bottom in direction of fault line.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey>See wallet 2023#12</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Ely Brookes-Hefetz, James Waite, Martin Green, Zach Woodford</explorers>
+<survex_file></survex_file>
+<underground_description>Narrow shaft leading straight down, potential turn at bottom in direction of fault line.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey>See wallet 2023#12</survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-EBH-02/2023-EBH-02.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-MG-06.html b/cave_data/1623-2023-MG-06.html
index 8892afbe4..53e690121 100644
--- a/cave_data/1623-2023-MG-06.html
+++ b/cave_data/1623-2023-MG-06.html
@@ -1,63 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 13, 2023, 10:20 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 13, 2023, 10:20 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-MG-06</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1623</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-MG-06</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-MG-06</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-MG-06</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 -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-MG-06</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
-<underground_description>Chossy snow boulder filled entrance shaft.  Too dangerous to descend though the snow.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers></explorers>
+<survex_file></survex_file>
+<underground_description>Chossy snow boulder filled entrance shaft.  Too dangerous to descend though the snow.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-MG-06/2023-MG-06.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-MM-02.html b/cave_data/1623-2023-MM-02.html
index f24fa9de5..b46e7b051 100644
--- a/cave_data/1623-2023-MM-02.html
+++ b/cave_data/1623-2023-MM-02.html
@@ -1,62 +1,48 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 10, 2024, 2:54 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 10, 2024, 2:54 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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></caveslug>--> <!-- Ignored. No longer required, we use the filename instead e.g. 1623-315 for 1623-315.html  -->
-<official_name>CliffRichards</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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code>+</kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-MM-02</unofficial_number><!-- (This is any name. Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name>CliffRichards</official_name>
+<area>1623</area>
+<kataster_code>+</kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-MM-02</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-MM-02</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 -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrance then the letter needs to be given. Must match the entranceslug ID.  -->
+  <entranceslug>1623-2023-MM-02</entranceslug>
+  <letter>a</letter>
 </entrance>
 
-<explorers>Merryn Matthews, Joel Stobbart, Emily Mabbet, Tom Phillips, Lizzie Caisley</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Boulder and snow filled rift by cliff face. Can climb down a few metres. [is this fully explored or not?]</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>none</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references><a href="/walletedit/2023:17">2023#17</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
+<explorers>Merryn Matthews, Joel Stobbart, Emily Mabbet, Tom Phillips, Lizzie Caisley</explorers>
+<survex_file></survex_file>
+<underground_description>Boulder and snow filled rift by cliff face. Can climb down a few metres. [is this fully explored or not?]</underground_description>
+<equipment>none</equipment>
+<references><a href="/walletedit/2023:17">2023#17</a></references>
+<survey></survey>
 <notes>cave sketched but not surveyed [where is the sketch, presumably Notes2.jpg in <b>2023#17</b>]
 <p>
-NewCave form in wallet as <b>newcave4.jpg</b></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost, and whether a kataster form has been sent to Austria for this cave -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth>5</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+NewCave form in wallet as <b>newcave4.jpg</b></notes>
+<length></length>
+<depth>5</depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-hbrw-05.html b/cave_data/1623-2023-hbrw-05.html
index d34b74650..72cd54274 100644
--- a/cave_data/1623-2023-hbrw-05.html
+++ b/cave_data/1623-2023-hbrw-05.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 14, 2023, 8:27 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 14, 2023, 8:27 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1623-2023-hbrw-05</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Rose Blumen Höhle</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-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-hbrw-05</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name>Rose Blumen Höhle</official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-hbrw-05</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2023-hbrw-05</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 -->
-  <!-- DEBUG  1623-2023-hbrw-05+1623-2023-hbrw-05 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-2023-hbrw-05</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Radost Waszkiewicz, Honorata Bogusz</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>An approx. 20m deep vertical hole, presumably continues. It was partially filled with snow upon discovery but the bottom was visible.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Radost Waszkiewicz, Honorata Bogusz</explorers>
+<survex_file></survex_file>
+<underground_description>An approx. 20m deep vertical hole, presumably continues. It was partially filled with snow upon discovery but the bottom was visible.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2023-hbrw-05/2023-hbrw-05.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-2019-HT-01.html b/cave_data/1626-2019-HT-01.html
index 11430b056..78725e63c 100644
--- a/cave_data/1626-2019-HT-01.html
+++ b/cave_data/1626-2019-HT-01.html
@@ -1,62 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 18, 2023, 2:09 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 18, 2023, 2:09 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1626-2019-HT-01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Das Bananenloch</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-->
-<area>1626</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2019-HT-01</unofficial_number><!-- (This is any name. Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name>Das Bananenloch</official_name>
+<area>1626</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2019-HT-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1626-2019-HT-01</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 -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1626-2019-HT-01</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>A deep pit in a large expanse of sloping limestone pavement up a hill. <p>The bottom is beyond what can be seen with a caving light in day time, but dropping rocks gives roughly 4 seconds of free fall, before ricocheting further down and unknown amount.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references>Logbook <a href="/logbookentry/2019-07-20/2019-07-20a">2019-07-20a</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers></explorers>
+<survex_file></survex_file>
+<underground_description>A deep pit in a large expanse of sloping limestone pavement up a hill. <p>The bottom is beyond what can be seen with a caving light in day time, but dropping rocks gives roughly 4 seconds of free fall, before ricocheting further down and unknown amount.</underground_description>
+<equipment></equipment>
+<references>Logbook <a href="/logbookentry/2019-07-20/2019-07-20a">2019-07-20a</a></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-2019-HT-02.html b/cave_data/1626-2019-HT-02.html
index 557c5a918..095b6067e 100644
--- a/cave_data/1626-2019-HT-02.html
+++ b/cave_data/1626-2019-HT-02.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1626-2019-HT-02</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Boop-Boo-Da-Boop-Da-Boop</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-->
-<area>1626</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2019-HT-02</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name>Boop-Boo-Da-Boop-Da-Boop</official_name>
+<area>1626</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2019-HT-02</unofficial_number>
 
 <entrance>
-  <entranceslug>1626-2019-HT-02</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 -->
-  <!-- DEBUG  1626-2019-HT-02+1626-2019-HT-02 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1626-2019-HT-02</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers></explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>The Boop-Boo-Da-Boop-Da-Boop [exact spelling pending confirmation] [2019-HT-02] complex is an area of multiple very large holes surrounding a small flat expanse of karst, half surrounded by cliffs. <p>Two of the entrances are extremely appealing, with one a few meters wide and unknown depth (again, the rocks take long to go down, a disto would've been helpful), and another similarly wide and quite deep and clearly going diagonally into the hillside, reducing likelihood of being choked.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references>Logbook <a href="/logbookentry/2019-07-20/2019-07-20a">2019-07-20a</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers></explorers>
+<survex_file></survex_file>
+<underground_description>The Boop-Boo-Da-Boop-Da-Boop [exact spelling pending confirmation] [2019-HT-02] complex is an area of multiple very large holes surrounding a small flat expanse of karst, half surrounded by cliffs. <p>Two of the entrances are extremely appealing, with one a few meters wide and unknown depth (again, the rocks take long to go down, a disto would've been helpful), and another similarly wide and quite deep and clearly going diagonally into the hillside, reducing likelihood of being choked.</underground_description>
+<equipment></equipment>
+<references>Logbook <a href="/logbookentry/2019-07-20/2019-07-20a">2019-07-20a</a></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1626/2019-HT-02/2019-HT-02.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-2023-BL-01.html b/cave_data/1626-2023-BL-01.html
index 5692d0a94..bddeb1f00 100644
--- a/cave_data/1626-2023-BL-01.html
+++ b/cave_data/1626-2023-BL-01.html
@@ -1,68 +1,50 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1626-2023-BL-01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1626</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-BL-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1626</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-BL-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1626-2023-BL-01</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 -->
-  <!-- DEBUG  1626-2023-BL-01+1626-2023-BL-01 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1626-2023-BL-01</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Becka Lawson</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Open shaft with a possible further drop under the overhang of one wall</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>Pitch, at least 10m</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<explorers>Becka Lawson</explorers>
+<survex_file></survex_file>
+<underground_description>Open shaft with a possible further drop under the overhang of one wall</underground_description>
+<equipment>Pitch, at least 10m</equipment>
+<references></references>
+<survey></survey>
 <notes><h3>View of entrance shaft</h3>
 <a href='/1626/2023-BL-01/l/20230715_161532.html'><img src='/1626/2023-BL-01/t/20230715_161532.jpg' /></a>
 
 <h3>Different view of entrance shaft</h3>
-<a href='/1626/2023-BL-01/l/20230715_161552.html'><img src='/1626/2023-BL-01/t/20230715_161552.jpg' /></a></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<a href='/1626/2023-BL-01/l/20230715_161552.html'><img src='/1626/2023-BL-01/t/20230715_161552.jpg' /></a></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1626/2023-BL-01/2023-BL-01.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-2023-BL-03.html b/cave_data/1626-2023-BL-03.html
index 12444b16c..33847c14a 100644
--- a/cave_data/1626-2023-BL-03.html
+++ b/cave_data/1626-2023-BL-03.html
@@ -1,68 +1,50 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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>1626-2023-BL-03</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name></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-->
-<area>1626</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-BL-03</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1626</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-BL-03</unofficial_number>
 
 <entrance>
-  <entranceslug>1626-2023-BL-03</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 -->
-  <!-- DEBUG  1626-2023-BL-03+1626-2023-BL-03 'Z' == -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1626-2023-BL-03</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Becka Lawson</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Smallish hole at base of an open shaft produces a long rumble when stones thrown down it</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment>Drop p5 to get to hole at base of shaft</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<explorers>Becka Lawson</explorers>
+<survex_file></survex_file>
+<underground_description>Smallish hole at base of an open shaft produces a long rumble when stones thrown down it</underground_description>
+<equipment>Drop p5 to get to hole at base of shaft</equipment>
+<references></references>
+<survey></survey>
 <notes><h3>Open shaft</h3>
 <a href='/1626/2023-BL-03/l/20230715_172732.html'><img src='/1626/2023-BL-03/t/20230715_172732.jpg' /></a>
 
 <h3>Different view of open shaft</h3>
-<a href='/1626/2023-BL-03/l/20230715_172718.html'><img src='/1626/2023-BL-03/t/20230715_172718.jpg' /></a></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<a href='/1626/2023-BL-03/l/20230715_172718.html'><img src='/1626/2023-BL-03/t/20230715_172718.jpg' /></a></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1626/2023-BL-03/2023-BL-03.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-2023-ww-01.html b/cave_data/1626-2023-ww-01.html
index dcc376ede..2e787a0ce 100644
--- a/cave_data/1626-2023-ww-01.html
+++ b/cave_data/1626-2023-ww-01.html
@@ -1,61 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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. -->
-<official_name>Ancient Technology</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-->
-<area>1626</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-ww-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name>Ancient Technology</official_name>
+<area>1626</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2023-ww-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1626-2023-ww-01</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 -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1626-2023-ww-01</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Nathan, Manfred on 2023-08-02.</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
-<underground_description>Simple slanting hole</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey><a href="/survey_scans/2023%252377/">2023#77</a></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes>Location approach <a href="/logbookentry/2023-08-02/2023-08-02b">logbook 2023-08-02b</a></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Nathan, Manfred on 2023-08-02.</explorers>
+<survex_file></survex_file>
+<underground_description>Simple slanting hole</underground_description>
+<equipment></equipment>
+<references></references>
+<survey><a href="/survey_scans/2023%252377/">2023#77</a></survey>
+<notes>Location approach <a href="/logbookentry/2023-08-02/2023-08-02b">logbook 2023-08-02b</a></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<description_file></description_file>
 </cave>
 </body>
 </html>
