diff --git a/cave_data/1623-2013-cucc-01B.html b/cave_data/1623-2013-cucc-B-01.html
similarity index 94%
rename from cave_data/1623-2013-cucc-01B.html
rename to cave_data/1623-2013-cucc-B-01.html
index 47fa23697..075a8cf31 100644
--- a/cave_data/1623-2013-cucc-01B.html
+++ b/cave_data/1623-2013-cucc-B-01.html
@@ -23,10 +23,10 @@ the form documented at
 <area>1623</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
-<unofficial_number>2013-cucc-01B</unofficial_number>
+<unofficial_number>2013-cucc-B-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2013-cucc-01B</entranceslug>
+  <entranceslug>1623-2013-cucc-B-01</entranceslug>
   <letter></letter>
 </entrance>
 
diff --git a/cave_data/1623-2013-cucc-draft4pit.html b/cave_data/1623-2013-cucc-draft4pit-09.html
similarity index 94%
rename from cave_data/1623-2013-cucc-draft4pit.html
rename to cave_data/1623-2013-cucc-draft4pit-09.html
index c92f8c854..718d437b9 100644
--- a/cave_data/1623-2013-cucc-draft4pit.html
+++ b/cave_data/1623-2013-cucc-draft4pit-09.html
@@ -23,10 +23,10 @@ the form documented at
 <area>1623</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
-<unofficial_number>2013-cucc-draft4pit</unofficial_number>
+<unofficial_number>2013-cucc-draft4pit-09</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2013-cucc-draft4pit</entranceslug>
+  <entranceslug>1623-2013-cucc-draft4pit-09</entranceslug>
   <letter></letter>
 </entrance>
 
diff --git a/cave_data/1623-2013-cucc-01-DUP.html b/cave_data/1623-2013-cucc-pit-09.html
similarity index 94%
rename from cave_data/1623-2013-cucc-01-DUP.html
rename to cave_data/1623-2013-cucc-pit-09.html
index f39f853f0..fe079da79 100644
--- a/cave_data/1623-2013-cucc-01-DUP.html
+++ b/cave_data/1623-2013-cucc-pit-09.html
@@ -23,10 +23,10 @@ the form documented at
 <area>1623</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
-<unofficial_number>2013-cucc-01-DUP</unofficial_number>
+<unofficial_number>2013-cucc-pit-09</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2013-cucc-01-DUP</entranceslug>
+  <entranceslug>1623-2013-cucc-pit-09</entranceslug>
   <letter></letter>
 </entrance>
 
diff --git a/cave_data/1623-2013-cucc-pit.html b/cave_data/1623-2013-cucc-pit.html
deleted file mode 100644
index 544447550..000000000
--- a/cave_data/1623-2013-cucc-pit.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
-<!-- Only put one cave in this file -->
-<!-- If you edit this 162x-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
-though, you do not need to do a data import as it happens automatically -->
-<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
-the form documented at 
-<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
-<br>
-
-<cave>
-<non_public>False</non_public>
-<unexplored>True</unexplored>
-
-<official_name></official_name>
-<area>1623</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2013-cucc-pit</unofficial_number>
-
-<entrance>
-  <entranceslug>1623-2013-cucc-pit</entranceslug>
-  <letter></letter>
-</entrance>
-
-<explorers></explorers>
-<survex_file></survex_file>
-<underground_description>Pending cave write-up Only logbook entries and wallet prospecting notes.
-<p>
-  <a href="/surveyscans/2013/2013%2302/typedup.txt">Wallet listing</a><br />
-  <a href="http://localhost:8000/survey_scans/2013%252302/">Wallet 2013-02</a><br />
-  <a href="http://localhost:8000/survey_scans/2013%252314/">Wallet 2013-14</a><br />
-  <a href="/expofiles/surveyscans/2013/2013%2323/cave064.jpg">Wallet 2013-23</a> - one image<br />
-  <a href="/wallets/year/2013">Wallets 2013</a><br /><br />
-  
-  <a href="/years/2013/logbook.html">Full Logbook 2013</a><br /><br /></underground_description>
-<equipment></equipment>
-<references></references>
-<survey></survey>
-<notes></notes>
-<length></length>
-<depth></depth>
-<extent></extent>
-
-<description_file></description_file>
-</cave>
-</body>
-</html>
diff --git a/cave_data/1623-2013-cucc-slope.html b/cave_data/1623-2013-cucc-slope-09.html
similarity index 94%
rename from cave_data/1623-2013-cucc-slope.html
rename to cave_data/1623-2013-cucc-slope-09.html
index 77b9e6847..9d61c0b44 100644
--- a/cave_data/1623-2013-cucc-slope.html
+++ b/cave_data/1623-2013-cucc-slope-09.html
@@ -23,10 +23,10 @@ the form documented at
 <area>1623</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
-<unofficial_number>2013-cucc-slope</unofficial_number>
+<unofficial_number>2013-cucc-slope-09</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2013-cucc-slope</entranceslug>
+  <entranceslug>1623-2013-cucc-slope-09</entranceslug>
   <letter></letter>
 </entrance>
 
diff --git a/cave_data/pendingcaves.txt b/cave_data/pendingcaves.txt
index 52585a8af..99890ee03 100644
--- a/cave_data/pendingcaves.txt
+++ b/cave_data/pendingcaves.txt
@@ -9,13 +9,43 @@
 ; This file is only parsed when a full database reset is done on the server.
 
 ; example entry (without the initial semicolon of course):
-;1626-2019-HT-01 ; Banana Hole, see logbook
+;1623-2025-pb-03 ; https://expo.survex.com/logbookentry/2025-07-14/2025-07-14e
+
 1623-2025-pb-01 ; date ?
-1623-2025-pb-02 ; /logbookentry/2025-07-12/2025-07-12a
 1623-2025-pb-03 ; https://expo.survex.com/logbookentry/2025-07-14/2025-07-14e
 1623-2025-pb-04 ; https://expo.survex.com/logbookentry/2025-07-14/2025-07-14e
 1623-2025-pb-05 ; https://expo.survex.com/logbookentry/2025-07-14/2025-07-14e
 
+; locations taken from the code in parsers/locations.py 
+; when they should not be in the code, but in the data here
+;("1623.p2013-cucc-pit", "no ent", False, nullent),
+
+1626-2013-cucc-draftyholes-09
+1626-2013-cucc-pitarea-09
+1626-2013-cucc-goodpit-09
+1626-2023-cucc-22mpit-09
+1626-2013-cucc-lineofpits-09
+1626-2013-cucc-12mpit-09
+1626-2013-cucc-20mpit-09
+1626-2013-cucc-2s-drop-09
+1626-2013-cucc-01cp-09
+1626-2013-cucc-rift-09
+1626-2013-cucc-snowplug2-09
+1626-2013-cucc-DraftHole-09
+1626-2013-cucc-setofsnowholes-09
+1626-2013-cucc-stotp20-09
+1626-2013-cucc-snowplug-09
+1626-2013-cucc-draft3pit-09
+1626-2013-cucc-draft2pit-09
+
+1626-2014-ms-01
+1626-2014-ms-02
+1626-2014-ms-03
+1626-2014-ms-04
+1626-2014-ms-05
+1626-2014-ms-06
+1626-2014-ms-07
+
 
 
 
diff --git a/entrance_data/1623-2013-cucc-01-DUP.html b/entrance_data/1623-2013-cucc-01-DUP.html
deleted file mode 100644
index 9ac31a899..000000000
--- a/entrance_data/1623-2013-cucc-01-DUP.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-2013-cucc-01-DUP</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2013-cucc-01-DUP</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></lat_wgs84> 
-<long_wgs84></long_wgs84> 
-<tag_station></tag_station>
-<other_station>1623.p2013-cucc-01-DUP</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-2013-cucc-01.html b/entrance_data/1623-2013-cucc-01.html
index dd2d194e9..f5645c106 100644
--- a/entrance_data/1623-2013-cucc-01.html
+++ b/entrance_data/1623-2013-cucc-01.html
@@ -48,7 +48,7 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
-<tag_station>1623.p2013-cucc-01-DUP</tag_station>
+<tag_station>1623.p2013-cucc-01-dup</tag_station>
 <other_station>1623.p2013-cucc-01</other_station>
 <other_description></other_description>
 <bearings></bearings> <!-- this is now read-only and not editable on the forms-->
diff --git a/entrance_data/1623-2013-cucc-01B.html b/entrance_data/1623-2013-cucc-B-01.html
similarity index 92%
rename from entrance_data/1623-2013-cucc-01B.html
rename to entrance_data/1623-2013-cucc-B-01.html
index 9a858b184..84ebaca6e 100644
--- a/entrance_data/1623-2013-cucc-01B.html
+++ b/entrance_data/1623-2013-cucc-B-01.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-2013-cucc-01B</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2013-cucc-01B</name>
+<slug>1623-2013-cucc-B-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2013-cucc-B-01</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <location_description></location_description>
@@ -49,7 +49,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station></tag_station>
-<other_station>1623.p2013-cucc-01B</other_station>
+<other_station>1623.p2013-cucc-01b</other_station>
 <other_description></other_description>
 <bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
diff --git a/entrance_data/1623-2013-cucc-draft4pit.html b/entrance_data/1623-2013-cucc-draft4pit-09.html
similarity index 91%
rename from entrance_data/1623-2013-cucc-draft4pit.html
rename to entrance_data/1623-2013-cucc-draft4pit-09.html
index a0b378743..9f5564470 100644
--- a/entrance_data/1623-2013-cucc-draft4pit.html
+++ b/entrance_data/1623-2013-cucc-draft4pit-09.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-2013-cucc-draft4pit</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2013-cucc-draft4pit</name>
+<slug>1623-2013-cucc-draft4pit-09</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2013-cucc-draft4pit-09</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <location_description></location_description>
@@ -48,7 +48,7 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
-<tag_station>1623.p2013-cucc-draft4pit-DUP</tag_station>
+<tag_station>1623.p2013-cucc-draft4pit-dup</tag_station>
 <other_station>1623.p2013-cucc-draft4pit</other_station>
 <other_description></other_description>
 <bearings></bearings> <!-- this is now read-only and not editable on the forms-->
diff --git a/entrance_data/1623-2013-cucc-pit.html b/entrance_data/1623-2013-cucc-pit-09.html
similarity index 94%
rename from entrance_data/1623-2013-cucc-pit.html
rename to entrance_data/1623-2013-cucc-pit-09.html
index 92c5531f7..f903a76da 100644
--- a/entrance_data/1623-2013-cucc-pit.html
+++ b/entrance_data/1623-2013-cucc-pit-09.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-2013-cucc-pit</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2013-cucc-pit</name>
+<slug>1623-2013-cucc-pit-09</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2013-cucc-pit-09</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <location_description></location_description>
diff --git a/entrance_data/1623-2013-cucc-slope.html b/entrance_data/1623-2013-cucc-slope-09.html
similarity index 94%
rename from entrance_data/1623-2013-cucc-slope.html
rename to entrance_data/1623-2013-cucc-slope-09.html
index 725970018..ff164ff35 100644
--- a/entrance_data/1623-2013-cucc-slope.html
+++ b/entrance_data/1623-2013-cucc-slope-09.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-2013-cucc-slope</slug> <!-- one entrance and one slug per entrance_data file -->
-<name>2013-cucc-slope</name>
+<slug>1623-2013-cucc-slope-09</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2013-cucc-slope-09</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <location_description></location_description>
