From 57c43f491aa0b1763cd44df5052769c586aa6259 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Tue, 2 Jul 2024 19:30:08 +0300
Subject: [PATCH] final lot of katasterd cave entrances renamed

---
 cave_data/1623-307.html                                  | 6 ++----
 cave_data/1623-308.html                                  | 5 ++---
 cave_data/1623-309.html                                  | 6 ++----
 cave_data/1623-310.html                                  | 4 +---
 cave_data/1623-311.html                                  | 4 +---
 cave_data/1623-312.html                                  | 4 +---
 cave_data/1623-313.html                                  | 4 +---
 cave_data/1623-314.html                                  | 2 +-
 cave_data/1623-315.html                                  | 2 +-
 cave_data/1623-316.html                                  | 2 +-
 cave_data/1623-317.html                                  | 2 +-
 cave_data/1623-320.html                                  | 4 +---
 cave_data/1623-321.html                                  | 4 +---
 cave_data/1623-322.html                                  | 4 +---
 cave_data/1623-323.html                                  | 7 ++-----
 entrance_data/{1623-2023-ASH-05a.html => 1623-307a.html} | 0
 entrance_data/{1623-2023-ASH-05b.html => 1623-307b.html} | 0
 entrance_data/{1623-2023-ASH-08a.html => 1623-308a.html} | 0
 entrance_data/{1623-2023-ASH-08b.html => 1623-308b.html} | 0
 entrance_data/{1623-2023-ASH-09a.html => 1623-309a.html} | 0
 entrance_data/{1623-2023-mg-04.html => 1623-310.html}    | 0
 entrance_data/{1623-2023-ASH-16.html => 1623-311.html}   | 0
 entrance_data/{1623-2023-RAWDB-02.html => 1623-312.html} | 0
 entrance_data/{1623-2023-RAWDB-01.html => 1623-313.html} | 0
 entrance_data/{1623-2023-KT-02.html => 1623-314.html}    | 0
 entrance_data/{1623-2023-JSS-01.html => 1623-315.html}   | 0
 entrance_data/{1623-2023-KT-01.html => 1623-316.html}    | 0
 entrance_data/{1623-2023-ft-02.html => 1623-317.html}    | 0
 entrance_data/{1623-2023-hbrw-04.html => 1623-320.html}  | 0
 entrance_data/{1623-2023-hbrw-01.html => 1623-321.html}  | 0
 entrance_data/{1623-2023-hbrw-02.html => 1623-322.html}  | 0
 entrance_data/{1623-2023-hbrw-03.html => 1623-323.html}  | 0
 32 files changed, 19 insertions(+), 41 deletions(-)
 rename entrance_data/{1623-2023-ASH-05a.html => 1623-307a.html} (100%)
 rename entrance_data/{1623-2023-ASH-05b.html => 1623-307b.html} (100%)
 rename entrance_data/{1623-2023-ASH-08a.html => 1623-308a.html} (100%)
 rename entrance_data/{1623-2023-ASH-08b.html => 1623-308b.html} (100%)
 rename entrance_data/{1623-2023-ASH-09a.html => 1623-309a.html} (100%)
 rename entrance_data/{1623-2023-mg-04.html => 1623-310.html} (100%)
 rename entrance_data/{1623-2023-ASH-16.html => 1623-311.html} (100%)
 rename entrance_data/{1623-2023-RAWDB-02.html => 1623-312.html} (100%)
 rename entrance_data/{1623-2023-RAWDB-01.html => 1623-313.html} (100%)
 rename entrance_data/{1623-2023-KT-02.html => 1623-314.html} (100%)
 rename entrance_data/{1623-2023-JSS-01.html => 1623-315.html} (100%)
 rename entrance_data/{1623-2023-KT-01.html => 1623-316.html} (100%)
 rename entrance_data/{1623-2023-ft-02.html => 1623-317.html} (100%)
 rename entrance_data/{1623-2023-hbrw-04.html => 1623-320.html} (100%)
 rename entrance_data/{1623-2023-hbrw-01.html => 1623-321.html} (100%)
 rename entrance_data/{1623-2023-hbrw-02.html => 1623-322.html} (100%)
 rename entrance_data/{1623-2023-hbrw-03.html => 1623-323.html} (100%)

diff --git a/cave_data/1623-307.html b/cave_data/1623-307.html
index 7dab94690..b5767dba5 100644
--- a/cave_data/1623-307.html
+++ b/cave_data/1623-307.html
@@ -17,9 +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-ASH-05</caveslug><!--(Ignored). 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>Kleine Zelthö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
 
@@ -39,12 +37,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-ASH-05</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-ASH-05a</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-307a</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.  -->
 </entrance>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-05b</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-307b</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>b</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-308.html b/cave_data/1623-308.html
index 29fe66930..c1fb8f3f2 100644
--- a/cave_data/1623-308.html
+++ b/cave_data/1623-308.html
@@ -17,7 +17,6 @@ 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-ASH-08</caveslug><!--(Ignored). 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>Top-Camp-Bandhö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'
@@ -39,12 +38,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-ASH-08</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-ASH-08a</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-308a</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.  -->
 </entrance>
 
 <entrance>
-  <entranceslug>1623-2023-ASH-08b</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-308b</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>b</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-309.html b/cave_data/1623-309.html
index f0cac1016..b57aefdf7 100644
--- a/cave_data/1623-309.html
+++ b/cave_data/1623-309.html
@@ -17,9 +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-ASH-09</caveslug><!--(Ignored). 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>Fledermaus- versus Rattenhö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" -->
+<official_name>Fledermaus- versus Rattenh&ouml;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-->
 <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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-ASH-09</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-ASH-09a</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-309a</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.  -->
 </entrance>
 
diff --git a/cave_data/1623-310.html b/cave_data/1623-310.html
index 535ea9259..c848bf799 100644
--- a/cave_data/1623-310.html
+++ b/cave_data/1623-310.html
@@ -17,9 +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-mg-04</caveslug><!--(Ignored). 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>Schlüssellochhö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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-mg-04</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-mg-04</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-310</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-311.html b/cave_data/1623-311.html
index ec098ca4d..b0dfbf6cf 100644
--- a/cave_data/1623-311.html
+++ b/cave_data/1623-311.html
@@ -17,9 +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-ASH-16</caveslug><!--(Ignored). 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>Langweiliges Loch</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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-ASH-16</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-ASH-16</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-311</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.  -->
 </entrance>
 
diff --git a/cave_data/1623-312.html b/cave_data/1623-312.html
index 8448aa51a..166e02040 100644
--- a/cave_data/1623-312.html
+++ b/cave_data/1623-312.html
@@ -17,9 +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-RAWDB-02</caveslug><!--(Ignored). 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>Bergschacht</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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-RAWDB-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-RAWDB-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-312</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-313.html b/cave_data/1623-313.html
index a0ef83c6f..e4e07126d 100644
--- a/cave_data/1623-313.html
+++ b/cave_data/1623-313.html
@@ -17,9 +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-RAWDB-01</caveslug><!--(Ignored). 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>Totes Ballonloch</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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-RAWDB-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-RAWDB-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-313</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-314.html b/cave_data/1623-314.html
index a646444b4..6295ca685 100644
--- a/cave_data/1623-314.html
+++ b/cave_data/1623-314.html
@@ -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><!-- (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'-->
 
 <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-314</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-315.html b/cave_data/1623-315.html
index 82a4f566e..5dd8686ad 100644
--- a/cave_data/1623-315.html
+++ b/cave_data/1623-315.html
@@ -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><!-- (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'-->
 
 <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-315</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 entrance then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
diff --git a/cave_data/1623-316.html b/cave_data/1623-316.html
index 4439efd99..88aceed1f 100644
--- a/cave_data/1623-316.html
+++ b/cave_data/1623-316.html
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-KT-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-KT-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-316</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-317.html b/cave_data/1623-317.html
index 193da3ccd..443b3bfc5 100644
--- a/cave_data/1623-317.html
+++ b/cave_data/1623-317.html
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-ft-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-ft-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-317</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-320.html b/cave_data/1623-320.html
index a8a331f29..e4a871c14 100644
--- a/cave_data/1623-320.html
+++ b/cave_data/1623-320.html
@@ -17,9 +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-hbrw-04</caveslug><!--(Ignored). 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>Unglückliche Gämsenhö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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-hbrw-04</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-hbrw-04</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-320</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-321.html b/cave_data/1623-321.html
index f040d3f87..438244537 100644
--- a/cave_data/1623-321.html
+++ b/cave_data/1623-321.html
@@ -17,9 +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-hbrw-01</caveslug><!--(Ignored). 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>Kleiner Abfluss 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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-hbrw-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-hbrw-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-321</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-322.html b/cave_data/1623-322.html
index d347a279c..216ee19ee 100644
--- a/cave_data/1623-322.html
+++ b/cave_data/1623-322.html
@@ -17,9 +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-hbrw-02</caveslug><!--(Ignored). 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>Mittlerer Abfluss 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
 
@@ -39,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-hbrw-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'-->
 
 <entrance>
-  <entranceslug>1623-2023-hbrw-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-322</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-323.html b/cave_data/1623-323.html
index 56c43d854..494d1906c 100644
--- a/cave_data/1623-323.html
+++ b/cave_data/1623-323.html
@@ -17,10 +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-hbrw-03</caveslug><!--(Ignored). 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>Amphitheater 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>2/T+</kataster_code><!-- 'length-or-depth/type exploration'
+<official_name>Amphitheater 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--><kataster_code>2/T+</kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
     T   Trockenh&ouml;hlen (Dry caves)
@@ -39,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-hbrw-03</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'-->
 
 <entrance>
-  <entranceslug>1623-2023-hbrw-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 -->
+  <entranceslug>1623-323</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/entrance_data/1623-2023-ASH-05a.html b/entrance_data/1623-307a.html
similarity index 100%
rename from entrance_data/1623-2023-ASH-05a.html
rename to entrance_data/1623-307a.html
diff --git a/entrance_data/1623-2023-ASH-05b.html b/entrance_data/1623-307b.html
similarity index 100%
rename from entrance_data/1623-2023-ASH-05b.html
rename to entrance_data/1623-307b.html
diff --git a/entrance_data/1623-2023-ASH-08a.html b/entrance_data/1623-308a.html
similarity index 100%
rename from entrance_data/1623-2023-ASH-08a.html
rename to entrance_data/1623-308a.html
diff --git a/entrance_data/1623-2023-ASH-08b.html b/entrance_data/1623-308b.html
similarity index 100%
rename from entrance_data/1623-2023-ASH-08b.html
rename to entrance_data/1623-308b.html
diff --git a/entrance_data/1623-2023-ASH-09a.html b/entrance_data/1623-309a.html
similarity index 100%
rename from entrance_data/1623-2023-ASH-09a.html
rename to entrance_data/1623-309a.html
diff --git a/entrance_data/1623-2023-mg-04.html b/entrance_data/1623-310.html
similarity index 100%
rename from entrance_data/1623-2023-mg-04.html
rename to entrance_data/1623-310.html
diff --git a/entrance_data/1623-2023-ASH-16.html b/entrance_data/1623-311.html
similarity index 100%
rename from entrance_data/1623-2023-ASH-16.html
rename to entrance_data/1623-311.html
diff --git a/entrance_data/1623-2023-RAWDB-02.html b/entrance_data/1623-312.html
similarity index 100%
rename from entrance_data/1623-2023-RAWDB-02.html
rename to entrance_data/1623-312.html
diff --git a/entrance_data/1623-2023-RAWDB-01.html b/entrance_data/1623-313.html
similarity index 100%
rename from entrance_data/1623-2023-RAWDB-01.html
rename to entrance_data/1623-313.html
diff --git a/entrance_data/1623-2023-KT-02.html b/entrance_data/1623-314.html
similarity index 100%
rename from entrance_data/1623-2023-KT-02.html
rename to entrance_data/1623-314.html
diff --git a/entrance_data/1623-2023-JSS-01.html b/entrance_data/1623-315.html
similarity index 100%
rename from entrance_data/1623-2023-JSS-01.html
rename to entrance_data/1623-315.html
diff --git a/entrance_data/1623-2023-KT-01.html b/entrance_data/1623-316.html
similarity index 100%
rename from entrance_data/1623-2023-KT-01.html
rename to entrance_data/1623-316.html
diff --git a/entrance_data/1623-2023-ft-02.html b/entrance_data/1623-317.html
similarity index 100%
rename from entrance_data/1623-2023-ft-02.html
rename to entrance_data/1623-317.html
diff --git a/entrance_data/1623-2023-hbrw-04.html b/entrance_data/1623-320.html
similarity index 100%
rename from entrance_data/1623-2023-hbrw-04.html
rename to entrance_data/1623-320.html
diff --git a/entrance_data/1623-2023-hbrw-01.html b/entrance_data/1623-321.html
similarity index 100%
rename from entrance_data/1623-2023-hbrw-01.html
rename to entrance_data/1623-321.html
diff --git a/entrance_data/1623-2023-hbrw-02.html b/entrance_data/1623-322.html
similarity index 100%
rename from entrance_data/1623-2023-hbrw-02.html
rename to entrance_data/1623-322.html
diff --git a/entrance_data/1623-2023-hbrw-03.html b/entrance_data/1623-323.html
similarity index 100%
rename from entrance_data/1623-2023-hbrw-03.html
rename to entrance_data/1623-323.html