diff --git a/cave_data/1623-101.html b/cave_data/1623-101.html
index 34f1ba4e2..29a5c9de6 100644
--- a/cave_data/1623-101.html
+++ b/cave_data/1623-101.html
@@ -17,11 +17,6 @@
 <kataster_number>101</kataster_number> 
 <unofficial_number></unofficial_number>
 
-<entrance>
-  <entranceslug>1623-101main</entranceslug>
-  <letter>main</letter>
-</entrance>
-
 <entrance>
   <entranceslug>1623-101a</entranceslug>
   <letter>a</letter>
diff --git a/cave_data/1623-162.html b/cave_data/1623-162.html
index 7e5960f3f..99837d4a1 100644
--- a/cave_data/1623-162.html
+++ b/cave_data/1623-162.html
@@ -44,8 +44,8 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 </entrance>
 
 <entrance>
-  <entranceslug>1623-162main</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>main</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-162a</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>CUCC 1988. 162b independently discovered by Brian and Becka 1999 and relocated + tagged "1999-10" by Wookey and Andy A 2000.</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. -->
diff --git a/cave_data/1623-76.html b/cave_data/1623-76.html
index c915f3072..a18b9b932 100644
--- a/cave_data/1623-76.html
+++ b/cave_data/1623-76.html
@@ -39,20 +39,15 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>originally numbered 106</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-76a</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-76a</entranceslug>
   <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.  -->
 </entrance>
 
 <entrance>
-  <entranceslug>1623-76b</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-76b</entranceslug>
   <letter>b</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.  -->
 </entrance>
 
-<entrance>
-  <entranceslug>1623-76main</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>main</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.  -->
-</entrance>
-
 <explorers>CUCC 1977-79,2004-2006</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>caves-1623/76/76.svx</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><ul><li><a href="entrance.htm">Entrance Series</a></li><li><a href="70sroute.htm">1970's Route</a></li><li><a href="keg.htm">Keg Series</a></li><li><a href="brave.htm">Brave New World</a></li></ul></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/1626-LA34.html b/cave_data/1626-LA34.html
index 360f4d017..900c1b231 100644
--- a/cave_data/1626-LA34.html
+++ b/cave_data/1626-LA34.html
@@ -37,7 +37,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>LA34</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>1626-la34</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>1626-LA34</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-101a.html b/entrance_data/1623-101a.html
index 411c4d50d..f51f320f5 100644
--- a/entrance_data/1623-101a.html
+++ b/entrance_data/1623-101a.html
@@ -38,8 +38,8 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station>1623.p101a</tag_station>
-<exact_station></exact_station>
+<tag_station>1623.t101</tag_station>
+<exact_station>1623.p101a</exact_station>
 <other_station></other_station>
 <other_description></other_description>
 <bearings></bearings>
diff --git a/entrance_data/1623-101main.html b/entrance_data/1623-101main.html
deleted file mode 100644
index f87374497..000000000
--- a/entrance_data/1623-101main.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-
-
-<name></name>
-<entrance_description></entrance_description>
-<explorers></p><ul><li>CUCC 1977 - Team Youth (A.Waddington &amp; N.Thorne)</li><li>Surface survey to entrance CUCC, 1998</li></ul><p></explorers>
-<map_description></map_description>
-<location_description></location_description>
-<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>T</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability>S</findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station>1623.t101</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-162main.html b/entrance_data/1623-162a.html
similarity index 100%
rename from entrance_data/1623-162main.html
rename to entrance_data/1623-162a.html
diff --git a/entrance_data/1623-76main.html b/entrance_data/1623-76main.html
deleted file mode 100644
index f3a3468c6..000000000
--- a/entrance_data/1623-76main.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-
-
-<name></name>
-<entrance_description></entrance_description>
-<explorers>CUCC 1977-79,2004-2006</explorers>
-<map_description></map_description>
-<location_description></location_description>
-<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>T</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability>S</findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station>1623.p76</other_station>
-<other_description>entrance dotted triangle on 76</other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>
diff --git a/entrance_data/1626-la34.html b/entrance_data/1626-LA34.html
similarity index 100%
rename from entrance_data/1626-la34.html
rename to entrance_data/1626-LA34.html