diff --git a/cave_data/1623-2007-neu.html b/cave_data/1623-2007-neu.html
index f2f47d43d..cd1ec4675 100644
--- a/cave_data/1623-2007-neu.html
+++ b/cave_data/1623-2007-neu.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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-NEU</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2007-neu</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name>Nachbarschacht vom Grießkogel</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'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2007-neu</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-2007-NEU</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 -->
+  <entranceslug>1623-2007-neu</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.  -->
 </entrance>
 
diff --git a/cave_data/1623-2010-02.html b/cave_data/1623-2010-02.html
index bdc1c981a..64161f527 100644
--- a/cave_data/1623-2010-02.html
+++ b/cave_data/1623-2010-02.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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>2010-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2010-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name>zigzag cave</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'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2010-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'-->
 
 <entrance>
-  <entranceslug>2010-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 -->
+  <entranceslug>1623-2010-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></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.  -->
 </entrance>
 
diff --git a/cave_data/1623-2012-js-1.html b/cave_data/1623-2012-js-01.html
similarity index 93%
rename from cave_data/1623-2012-js-1.html
rename to cave_data/1623-2012-js-01.html
index 215257019..c9f1183e0 100644
--- a/cave_data/1623-2012-js-1.html
+++ b/cave_data/1623-2012-js-01.html
@@ -10,7 +10,7 @@
 <body>
 <cave>
 <non_public>False</non_public>
-<caveslug>1623-2012-js-1</caveslug>
+<caveslug>1623-2012-js-01</caveslug>
 <official_name>Fruhlingsmiereschact</official_name><!-- 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>
 <kataster_code></kataster_code>
@@ -18,7 +18,7 @@
 <unofficial_number>2012-js-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2012-js-1</entranceslug>
+  <entranceslug>1623-2012-js-01</entranceslug>
   <letter></letter>
 </entrance>
 
@@ -35,7 +35,7 @@ Shithouse small loose entrance onto shaft, shaft craps out at bottom with packed
 <length>2.5</length>
 <depth>44</depth>
 <extent></extent>
-<survex_file>caves-1623/2012-js-1/2012-js-1.svx</survex_file>
+<survex_file>caves-1623/2012-js-01/2012-js-01.svx</survex_file>
 <description_file></description_file><!-- Leave BLANK if this is the only description is in this form -->
 <url>1623/2012-js-01/2012-js-01.html</url>
 </cave>
diff --git a/cave_data/1623-2012-ns-08.html b/cave_data/1623-2012-ns-08.html
index 88243b59d..fef98981c 100644
--- a/cave_data/1623-2012-ns-08.html
+++ b/cave_data/1623-2012-ns-08.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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-2012-ns-08</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2012-ns-08</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name></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'
diff --git a/cave_data/1623-2012-ns-14.html b/cave_data/1623-2012-ns-14.html
index c386aa924..71b683bb5 100644
--- a/cave_data/1623-2012-ns-14.html
+++ b/cave_data/1623-2012-ns-14.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   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>1623-2012-ns-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'-->
+<unofficial_number>2012-ns-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'-->
 
 <entrance>
   <entranceslug>1623-2012-ns-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 -->
diff --git a/cave_data/1623-2012-ns-15.html b/cave_data/1623-2012-ns-15.html
index 245134f17..f573af908 100644
--- a/cave_data/1623-2012-ns-15.html
+++ b/cave_data/1623-2012-ns-15.html
@@ -29,7 +29,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>1623-2012-ns-15</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number>2012-ns-15</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
   <entranceslug>1623-2012-ns-15</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 -->
diff --git a/cave_data/1623-2018-MS-01.html b/cave_data/1623-2018-MS-01.html
index c4cd4fbd9..bb644d592 100644
--- a/cave_data/1623-2018-MS-01.html
+++ b/cave_data/1623-2018-MS-01.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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>2018-MS-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2018-MS-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name></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'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2018-MS-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'-->
 
 <entrance>
-  <entranceslug>2018-MS-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 -->
+  <entranceslug>1623-2018-MS-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.  -->
 </entrance>
 
diff --git a/cave_data/1623-2018-pf-01.html b/cave_data/1623-2018-pf-01.html
index ac54e98e4..d29477685 100644
--- a/cave_data/1623-2018-pf-01.html
+++ b/cave_data/1623-2018-pf-01.html
@@ -10,7 +10,7 @@
 <body>
 <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>2018-pf-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2018-pf-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name></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'
diff --git a/cave_data/1623-2018-pf-02.html b/cave_data/1623-2018-pf-02.html
index 8f38032c8..5c2838552 100644
--- a/cave_data/1623-2018-pf-02.html
+++ b/cave_data/1623-2018-pf-02.html
@@ -10,7 +10,7 @@
 <body>
 <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>2018-pf-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2018-pf-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name></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'
diff --git a/cave_data/1623-2023-JSS-01.html b/cave_data/1623-2023-JSS-01.html
index 14bb05332..d9e6c84c5 100644
--- a/cave_data/1623-2023-JSS-01.html
+++ b/cave_data/1623-2023-JSS-01.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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-jss-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2023-JSS-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name>Mendip Man</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'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-JSS-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-jss-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 -->
+  <entranceslug>1623-2023-JSS-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-jss-01+1623-2023-jss-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.  -->
 </entrance>
diff --git a/cave_data/1623-2023-KT-02.html b/cave_data/1623-2023-KT-02.html
index b20e8b7c6..f3bdb1eb8 100644
--- a/cave_data/1623-2023-KT-02.html
+++ b/cave_data/1623-2023-KT-02.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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-kt-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2023-KT-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name>Silver Moth</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'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-KT-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-kt-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 -->
+  <entranceslug>1623-2023-KT-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-kt-02+1623-2023-kt-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.  -->
 </entrance>
@@ -60,7 +60,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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-kt-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')-->
+<url>1623/2023-KT-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')-->
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2023-MG-06.html b/cave_data/1623-2023-MG-06.html
index 6d7ab826c..4f4e089a5 100644
--- a/cave_data/1623-2023-MG-06.html
+++ b/cave_data/1623-2023-MG-06.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   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'-->
+<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'-->
 
 <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 -->
diff --git a/cave_data/1623-Rentner-Express.html b/cave_data/1623-Rentner-Express.html
index 35a44542c..cd453f6f1 100644
--- a/cave_data/1623-Rentner-Express.html
+++ b/cave_data/1623-Rentner-Express.html
@@ -17,7 +17,7 @@ the form documented at
 
 <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-RENTNER</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-Rentner-Express</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name></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'
diff --git a/cave_data/1623-2023-JJS-01.html b/cave_data/1626-2018-AD-02.html
similarity index 55%
rename from cave_data/1623-2023-JJS-01.html
rename to cave_data/1626-2018-AD-02.html
index eb668d92a..ac9b9c1e1 100644
--- a/cave_data/1623-2023-JJS-01.html
+++ b/cave_data/1626-2018-AD-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 29, 2023, 9:01 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Sept. 24, 2023, 5:29 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
 make sure you update the database by doing a full data import. If you edit it using the online form
@@ -10,16 +10,16 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 29, 2023, 9:01 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Sept. 24, 2023, 5:29 p.m. UTC 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-JJS-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
-<official_name></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 -->
+<caveslug>1626-2018-AD-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<official_name>Garlic Cave</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
 
@@ -36,16 +36,17 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   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-JJS-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'-->
+<unofficial_number>2018-AD-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-JJS-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 -->
-  <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>1626-2018-AD-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-2018-AD-02+1623-2018-AD-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.  -->
 </entrance>
 
-<explorers>Kai Trusson, Luke Stangroom, 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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
-<underground_description>Low, wide entrance has a loose, drafting hole on the right that soon ends in a boulder choke. On the left of the entrance a short grovel leads to a crawling phreatic passage. A tight lead on the right probably connects to unsurveyed passage that leads off later on the right. Continuing ahead becomes a low, painful crawl over sharp rocks until a second entrance is found on the left, a snow-filled hole. On the right a short, larger passage soon ends in a climb and then a tight squeeze that has not been pushed.</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. -->
+<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>Lots waiting to be done</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. -->
@@ -57,7 +58,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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-JJS-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')-->
+<url>1626/2018-AD-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')-->
 </cave>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/cave_data/pendingcaves.txt b/cave_data/pendingcaves.txt
index 3e3e3a575..7bd30ada9 100644
--- a/cave_data/pendingcaves.txt
+++ b/cave_data/pendingcaves.txt
@@ -13,9 +13,5 @@
 1623-2019-rh-01
 1623-2023-WW-01
 1626-BuzzardHole
-1626-2018-ad-02
-2018-pw-03-02
-1626-2018-ad-02
-1626-2018-ad-02
-2018-pw-03-02
-1626-2018-ad-02
+
+
diff --git a/entrance_data/1623-2007-NEU.html b/entrance_data/1623-2007-neu.html
similarity index 97%
rename from entrance_data/1623-2007-NEU.html
rename to entrance_data/1623-2007-neu.html
index c9d9c95b8..508d7e442 100644
--- a/entrance_data/1623-2007-NEU.html
+++ b/entrance_data/1623-2007-neu.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2007-NEU</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2007-neu</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers>ARGE</explorers>
diff --git a/entrance_data/1623-2012-js-01.html b/entrance_data/1623-2012-js-01.html
index 0524d3c8b..c9cbd29fc 100644
--- a/entrance_data/1623-2012-js-01.html
+++ b/entrance_data/1623-2012-js-01.html
@@ -8,7 +8,7 @@
 <body>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-js-1</slug>
+<slug>1623-2012-js-01</slug>
 <name></name>
 <entrance_description>Small slot behind boulder, slot opens onto small chamber which has window onto pitch.</entrance_description>
 <explorers>Frank Tully</explorers>
diff --git a/entrance_data/2018-MS-01.html b/entrance_data/1623-2018-MS-01.html
similarity index 96%
rename from entrance_data/2018-MS-01.html
rename to entrance_data/1623-2018-MS-01.html
index f00c7b8c7..b67f7b2c7 100644
--- a/entrance_data/2018-MS-01.html
+++ b/entrance_data/1623-2018-MS-01.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>2018-MS-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2018-MS-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>2018-MS-01</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/1623-2023-jss-01.html b/entrance_data/1623-2023-JSS-01.html
similarity index 97%
rename from entrance_data/1623-2023-jss-01.html
rename to entrance_data/1623-2023-JSS-01.html
index e907820d9..9d09df895 100644
--- a/entrance_data/1623-2023-jss-01.html
+++ b/entrance_data/1623-2023-JSS-01.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2023-jss-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2023-JSS-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>Mendip Man</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/1623-2023-kt-02.html b/entrance_data/1623-2023-KT-02.html
similarity index 97%
rename from entrance_data/1623-2023-kt-02.html
rename to entrance_data/1623-2023-KT-02.html
index 07a8560f0..4e7095189 100644
--- a/entrance_data/1623-2023-kt-02.html
+++ b/entrance_data/1623-2023-KT-02.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2023-kt-02</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2023-KT-02</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>