diff --git a/cave_data/1623-2023-ASH-01.html b/cave_data/1623-2023-ASH-01.html
index c8f5382f0..fa201f77a 100644
--- a/cave_data/1623-2023-ASH-01.html
+++ b/cave_data/1623-2023-ASH-01.html
@@ -38,6 +38,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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'-->
 
+<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 -->
+  <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>
 <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/cavenum/cavnum.svx". (e.g. caves/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. -->
diff --git a/cave_data/1623-2023-ASH-02.html b/cave_data/1623-2023-ASH-02.html
index ec5578901..58f5195f5 100644
--- a/cave_data/1623-2023-ASH-02.html
+++ b/cave_data/1623-2023-ASH-02.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <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'-->
-
+<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 -->
+  <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>
 <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>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. -->
diff --git a/cave_data/1623-2023-ASH-03.html b/cave_data/1623-2023-ASH-03.html
index efbb1b256..74d4cfd66 100644
--- a/cave_data/1623-2023-ASH-03.html
+++ b/cave_data/1623-2023-ASH-03.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <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'-->
-
+<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 -->
+  <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>
 <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/cavenum/cavnum.svx". (e.g. caves/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. -->
diff --git a/cave_data/1623-2023-ASH-04.html b/cave_data/1623-2023-ASH-04.html
index dd65817ed..00997b87d 100644
--- a/cave_data/1623-2023-ASH-04.html
+++ b/cave_data/1623-2023-ASH-04.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <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'-->
-
+<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 -->
+  <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>
 <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/cavenum/cavnum.svx". (e.g. caves/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. -->
diff --git a/cave_data/1623-2023-ASH-06.html b/cave_data/1623-2023-ASH-06.html
index d923bf033..a58ec5b0d 100644
--- a/cave_data/1623-2023-ASH-06.html
+++ b/cave_data/1623-2023-ASH-06.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <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'-->
-
+<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 -->
+  <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>
 <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/cavenum/cavnum.svx". (e.g. caves/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. -->
diff --git a/cave_data/1623-2023-ASH-07.html b/cave_data/1623-2023-ASH-07.html
index f7f9a3be9..085d18014 100644
--- a/cave_data/1623-2023-ASH-07.html
+++ b/cave_data/1623-2023-ASH-07.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <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'-->
-
+<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 -->
+  <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>
 <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/cavenum/cavnum.svx". (e.g. caves/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. -->
diff --git a/cave_data/1623-2023-JS-02.html b/cave_data/1623-2023-JS-02.html
index c927ce6ce..eca0799d3 100644
--- a/cave_data/1623-2023-JS-02.html
+++ b/cave_data/1623-2023-JS-02.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
 <unofficial_number>2023-JS-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-JS-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>
 <explorers>Joel Stobbart, Emily Mabbet, Lizzie Caisley, Tom Phillips, Merryn Matthews.</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>Promising large opening leads ~5m WNW, promtly choking with boulders.</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. -->
diff --git a/cave_data/1623-2023-JS-03.html b/cave_data/1623-2023-JS-03.html
index b4e83386a..0c1e81037 100644
--- a/cave_data/1623-2023-JS-03.html
+++ b/cave_data/1623-2023-JS-03.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
 <unofficial_number>2023-JS-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'-->
-
+entrance>
+  <entranceslug>1623-2023-JS-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 -->
+  <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>
 <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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
 <underground_description>About a 5m climb down to a boulder ledge. potentially way on under boulders to the East and West, howevler chossy and sketchy</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. -->
diff --git a/cave_data/1623-2023-KT-01.html b/cave_data/1623-2023-KT-01.html
index e22c0154a..1a4985dae 100644
--- a/cave_data/1623-2023-KT-01.html
+++ b/cave_data/1623-2023-KT-01.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><!-- (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-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 -->
+  <entranceslug>1623-2023-KT-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.  -->
 </entrance>
 
diff --git a/cave_data/1623-2023-mm-02.html b/cave_data/1623-2023-mm-02.html
index bef758c3b..dd0ecaaef 100644
--- a/cave_data/1623-2023-mm-02.html
+++ b/cave_data/1623-2023-mm-02.html
@@ -37,7 +37,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
  -->
 <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><!-- (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-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></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>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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
 <underground_description>boulder and snow filled rift by cliff face.</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. -->
diff --git a/entrance_data/1623-2023-ASH-08z.html b/entrance_data/1623-2023-ASH-08z.html
deleted file mode 100644
index c3cf32ab2..000000000
--- a/entrance_data/1623-2023-ASH-08z.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 24, 2023, 2:38 p.m. UTC using the form documented at handbook/survey/ententry.html -->
-<!-- If you edit this 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 -->
-
-    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
-    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
-    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-
-<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 24, 2023, 2:38 p.m. UTC using the form documented at 
-<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
-<br>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-2023-ASH-08z</slug> <!-- one entrance and one slug per entrance_data file -->
-<name></name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<map_description></map_description>
-<location_description></location_description>
-<lastvisit></lastvisit>
-<approach></approach>
-<underground_description></underground_description>
-<photo></photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>?</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability></findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>
diff --git a/entrance_data/1623-2023-KT-01A.html b/entrance_data/1623-2023-KT-01a.html
similarity index 100%
rename from entrance_data/1623-2023-KT-01A.html
rename to entrance_data/1623-2023-KT-01a.html