diff --git a/cave_data/1623-2025-EM-02.html b/cave_data/1623-2025-EM-02.html
index 693c5acdf..aebd717f9 100644
--- a/cave_data/1623-2025-EM-02.html
+++ b/cave_data/1623-2025-EM-02.html
@@ -24,15 +24,6 @@ the form documented at
 <kataster_number></kataster_number> 
 <unofficial_number>2025-EM-02</unofficial_number>
 
-<entrance>
-  <entranceslug>1623-2025-EM-02</entranceslug>
-  <letter></letter>
-</entrance>
-
-<entrance>
-  <entranceslug>1623-2025-EM-02b</entranceslug>
-  <letter>b</letter>
-</entrance>
 
 <explorers></explorers>
 <survex_file></survex_file>
diff --git a/cave_data/1623-2025-HW-00.html b/cave_data/1623-2025-HW-00.html
index 89116b0a0..8ac2230d8 100644
--- a/cave_data/1623-2025-HW-00.html
+++ b/cave_data/1623-2025-HW-00.html
@@ -24,15 +24,7 @@ the form documented at
 <kataster_number></kataster_number> 
 <unofficial_number>2025-HW-00</unofficial_number>
 
-<entrance>
-  <entranceslug>1623-2025-HW-00</entranceslug>
-  <letter></letter>
-</entrance>
 
-<entrance>
-  <entranceslug>1623-2025-HW-00b</entranceslug>
-  <letter>b</letter>
-</entrance>
 
 <explorers></explorers>
 <survex_file></survex_file>
diff --git a/cave_data/1623-2025-LB-00.html b/cave_data/1623-2025-LB-00.html
index 97d5b03ad..b9c2d9690 100644
--- a/cave_data/1623-2025-LB-00.html
+++ b/cave_data/1623-2025-LB-00.html
@@ -24,15 +24,7 @@ the form documented at
 <kataster_number></kataster_number> 
 <unofficial_number>2025-LB-00</unofficial_number>
 
-<entrance>
-  <entranceslug>1623-2025-LB-00</entranceslug>
-  <letter></letter>
-</entrance>
 
-<entrance>
-  <entranceslug>1623-2025-LB-00b</entranceslug>
-  <letter>b</letter>
-</entrance>
 
 <explorers></explorers>
 <survex_file></survex_file>
diff --git a/entrance_data/1623-2025-EM-02a.html b/entrance_data/1623-2025-EM-02.html
similarity index 95%
rename from entrance_data/1623-2025-EM-02a.html
rename to entrance_data/1623-2025-EM-02.html
index fa1410efa..4b33d4631 100644
--- a/entrance_data/1623-2025-EM-02a.html
+++ b/entrance_data/1623-2025-EM-02.html
@@ -19,8 +19,8 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2025-EM-02b</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2025-EM-02b</name>
+<slug>1623-2025-EM-02</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2025-EM-02</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <location_description></location_description>
diff --git a/entrance_data/1623-2025-HW-00.html b/entrance_data/1623-2025-HW-00.html
index 48083fad5..1cc65b134 100644
--- a/entrance_data/1623-2025-HW-00.html
+++ b/entrance_data/1623-2025-HW-00.html
@@ -21,7 +21,7 @@ though, you do not need to do a data import as it happens automatically -->
 <non_public>False</non_public>
 <slug>1623-2025-HW-00</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>2025-HW-00</name>
-<entrance_description>testing..</entrance_description>
+<entrance_description></entrance_description>
 <explorers></explorers>
 <location_description></location_description>
 <lastvisit></lastvisit>
@@ -43,11 +43,11 @@ though, you do not need to do a data import as it happens automatically -->
                           S = Surveyed,
                           L = Lost,
                           R = Refindable" -->
-<findability>?</findability>
+<findability>S</findability>
 <findability_description></findability_description>
 <alt></alt>
-<lat_wgs84></lat_wgs84> 
-<long_wgs84></long_wgs84> 
+<lat_wgs84>47.69645</lat_wgs84> 
+<long_wgs84>13.81605</long_wgs84> 
 <tag_station></tag_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2025-HW-00b.html b/entrance_data/1623-2025-HW-00b.html
deleted file mode 100644
index 9cc59b589..000000000
--- a/entrance_data/1623-2025-HW-00b.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle  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>  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-2025-HW-00b</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2025-HW-00b</name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<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>S</findability>
-<findability_description></findability_description>
-<alt></alt>
-<lat_wgs84>47.69645</lat_wgs84> 
-<long_wgs84>13.81605</long_wgs84> 
-<tag_station></tag_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
-</entrance>
-</body>
-</html>
diff --git a/entrance_data/1623-2025-LB-00.html b/entrance_data/1623-2025-LB-00.html
index 8723bc3e3..a551d4d15 100644
--- a/entrance_data/1623-2025-LB-00.html
+++ b/entrance_data/1623-2025-LB-00.html
@@ -46,8 +46,8 @@ though, you do not need to do a data import as it happens automatically -->
 <findability>?</findability>
 <findability_description></findability_description>
 <alt></alt>
-<lat_wgs84></lat_wgs84> 
-<long_wgs84></long_wgs84> 
+<lat_wgs84>47.41478</lat_wgs84> 
+<long_wgs84>12.48588</long_wgs84> 
 <tag_station></tag_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2025-LB-00b.html b/entrance_data/1623-2025-LB-00b.html
deleted file mode 100644
index 552c9ffa6..000000000
--- a/entrance_data/1623-2025-LB-00b.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle  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>  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-2025-LB-00b</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2025-LB-00b</name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<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>
-<lat_wgs84>47.41478</lat_wgs84> 
-<long_wgs84>12.48588</long_wgs84> 
-<tag_station></tag_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
-</entrance>
-</body>
-</html>
