From db92d26b78e79030d934a846e153335c01fed2f9 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Tue, 10 Oct 2023 22:59:25 +0300
Subject: [PATCH] swapped 30 eastings/northings which were wrong

---
 cave_data/1623-2010-06.html           |  4 ++--
 cave_data/1623-2010-07.html           |  4 ++--
 cave_data/1623-2012-ft-01.html        |  4 ++--
 cave_data/1623-2012-ft-02.html        |  4 ++--
 cave_data/1623-2012-ns-03.html        |  4 ++--
 cave_data/1623-2014-BL888.html        |  4 ++--
 cave_data/1623-2018-MS-01.html        |  9 +++++----
 cave_data/1623-2018-NTU-02.html       |  4 ++--
 cave_data/1623-2018-aa-01.html        |  9 +++++----
 cave_data/1623-2018-pf-01.html        | 17 +++++++++++++----
 cave_data/1623-2018-pf-02.html        | 17 +++++++++++++----
 cave_data/1623-2023-JSS-01.html       |  6 +++---
 cave_data/1623-2023-KT-01.html        |  4 ++--
 cave_data/1623-2023-KT-02.html        |  6 +++---
 cave_data/1623-2023-OK-01.html        |  4 ++--
 cave_data/1623-2023-RAWDB-01.html     |  4 ++--
 cave_data/1623-2023-RAWDB-02.html     |  4 ++--
 cave_data/1623-2023-ft-01.html        | 11 ++++++-----
 cave_data/1623-2023-ft-02.html        |  9 +++++----
 cave_data/1623-2023-hbrw-04.html      |  4 ++--
 cave_data/1623-haldenloch.html        | 19 ++++++++++++++-----
 cave_data/1623-rentner.html           |  9 +++++----
 cave_data/1626-2023-BL-09.html        |  4 ++--
 cave_data/1626-361.html               |  9 +++++----
 entrance_data/1623-2010-06.html       |  8 ++++----
 entrance_data/1623-2010-07.html       | 10 +++++-----
 entrance_data/1623-2012-ft-01.html    |  8 ++++----
 entrance_data/1623-2012-ft-02.html    |  8 ++++----
 entrance_data/1623-2012-ns-03.html    |  8 ++++----
 entrance_data/1623-2014-BL888.html    |  6 +++---
 entrance_data/1623-2018-MS-01.html    | 10 ++++++----
 entrance_data/1623-2018-NTU-02.html   | 13 ++++++++-----
 entrance_data/1623-2018-aa-01.html    | 10 ++++++----
 entrance_data/1623-2018-pf-01.html    | 20 ++++++++++++++------
 entrance_data/1623-2018-pf-02.html    | 20 ++++++++++++++------
 entrance_data/1623-2023-JSS-01.html   |  8 +++++---
 entrance_data/1623-2023-KT-01.html    |  8 +++++---
 entrance_data/1623-2023-KT-02.html    |  8 +++++---
 entrance_data/1623-2023-OK-01.html    |  6 ++++--
 entrance_data/1623-2023-RAWDB-01.html |  8 +++++---
 entrance_data/1623-2023-RAWDB-02.html |  8 +++++---
 entrance_data/1623-2023-ft-01A.html   |  8 +++++---
 entrance_data/1623-2023-ft-02.html    |  8 +++++---
 entrance_data/1623-2023-hbrw-04.html  |  8 +++++---
 entrance_data/1623-haldenloch.html    | 16 ++++++++++++----
 entrance_data/1623-rentner.html       |  8 +++++---
 entrance_data/1626-2023-BL-09.html    |  8 +++++---
 entrance_data/1626-361.html           |  8 +++++---
 48 files changed, 246 insertions(+), 158 deletions(-)

diff --git a/cave_data/1623-2010-06.html b/cave_data/1623-2010-06.html
index 6bc53113d..4887c39aa 100644
--- a/cave_data/1623-2010-06.html
+++ b/cave_data/1623-2010-06.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 7, 2023, 8:59 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:57 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 7, 2023, 8:59 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:57 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2010-07.html b/cave_data/1623-2010-07.html
index 66bd43de4..69726f410 100644
--- a/cave_data/1623-2010-07.html
+++ b/cave_data/1623-2010-07.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 10, 2023, 11:56 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:57 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 10, 2023, 11:56 a.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:57 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2012-ft-01.html b/cave_data/1623-2012-ft-01.html
index 66417a03a..5a05ba898 100644
--- a/cave_data/1623-2012-ft-01.html
+++ b/cave_data/1623-2012-ft-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 7, 2023, 9:12 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:48 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 7, 2023, 9:12 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:48 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2012-ft-02.html b/cave_data/1623-2012-ft-02.html
index e72b1a98e..fd6a89bfd 100644
--- a/cave_data/1623-2012-ft-02.html
+++ b/cave_data/1623-2012-ft-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 7, 2023, 9:23 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:53 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 7, 2023, 9:23 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:53 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2012-ns-03.html b/cave_data/1623-2012-ns-03.html
index f6ee49fa5..2a10daea9 100644
--- a/cave_data/1623-2012-ns-03.html
+++ b/cave_data/1623-2012-ns-03.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 10, 2023, 6:37 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:55 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:37 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:55 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2014-BL888.html b/cave_data/1623-2014-BL888.html
index 70988a4bf..646a483fc 100644
--- a/cave_data/1623-2014-BL888.html
+++ b/cave_data/1623-2014-BL888.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:43 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:43 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2018-MS-01.html b/cave_data/1623-2018-MS-01.html
index bb644d592..50ebfe5b8 100644
--- a/cave_data/1623-2018-MS-01.html
+++ b/cave_data/1623-2018-MS-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 26, 2023, 6:11 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:58 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 26, 2023, 6:11 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:58 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -19,7 +19,7 @@ the form documented at
 <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-2018-MS-01</caveslug><!--(Required). 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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2018-MS-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 -->
+  <!-- DEBUG  1623-2018-MS-01+1623-2018-MS-01 'Z' == -->
   <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></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 -->
+<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-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
 <underground_description>Rubble slope with snow plug down to a jammed boulder. Wriggle down next to it to a 45° ramp down. This levels off to a tight squeeze down to a small chamber. Around 30m long with no draft.
 
 Sketch: see notes and photo on Becka's phone at 09:30 on 13/7/18
diff --git a/cave_data/1623-2018-NTU-02.html b/cave_data/1623-2018-NTU-02.html
index 52ae3acec..5cd4affa5 100644
--- a/cave_data/1623-2018-NTU-02.html
+++ b/cave_data/1623-2018-NTU-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:50 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:29 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:50 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:29 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2018-aa-01.html b/cave_data/1623-2018-aa-01.html
index cb5000667..0cc26a9c9 100644
--- a/cave_data/1623-2018-aa-01.html
+++ b/cave_data/1623-2018-aa-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 13, 2023, 9 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:54 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 13, 2023, 9 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:54 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -19,7 +19,7 @@ the form documented at
 <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-2018-aa-01</caveslug><!--(Required). 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>Achte auf die Lücke</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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2018-aa-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 -->
+  <!-- DEBUG  1623-2018-aa-01+1623-2018-aa-01 'Z' == -->
   <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>Adam Aldridge, Paul Fox</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/2018-aa-01/2018-aa-01.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file>caves-1623/2018-aa-01/2018-aa-01.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>Open rift leads to a 6m pich directly below the tag. Pitch lands in a chamber with a chossy, sloping floor. 
 At the lowest point of the slope is a crawling height passage, which was blocked by a boulder choke at the start of Expo 2018.
 These boulders were hauled out by Adam and Paul, to reveal a slightly larger chamber (resembling a bedding plane), containing a much more substantial boulder choke, held together with mud.</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-2018-pf-01.html b/cave_data/1623-2018-pf-01.html
index d29477685..6064ed2bc 100644
--- a/cave_data/1623-2018-pf-01.html
+++ b/cave_data/1623-2018-pf-01.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:52 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 -->
 <!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <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 Oct. 10, 2023, 8:52 p.m. UTC 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><!-- '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-2018-pf-01</caveslug><!--(Required). 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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2018-pf-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 -->
+  <!-- DEBUG  1623-2018-pf-01+1623-2018-pf-01 'Z' == -->
   <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>CUCC, Paul Fox, Natalie Uomini</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/2018-pf-01/2018-pf-01.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>See logbook /logbookentry/2018-08-08/t2018-08-08_plateau_to
 2018-PF-01 is a 2m-diameter shaft with an easy climb down to a mossy slope.</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. -->
 <equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
@@ -48,7 +57,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
-<survex_file>caves-1623/2018-pf-01/2018-pf-01.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2018-pf-01</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
diff --git a/cave_data/1623-2018-pf-02.html b/cave_data/1623-2018-pf-02.html
index 5c2838552..5feeb066d 100644
--- a/cave_data/1623-2018-pf-02.html
+++ b/cave_data/1623-2018-pf-02.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:49 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 -->
 <!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <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 Oct. 10, 2023, 8:49 p.m. UTC 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><!-- '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-2018-pf-02</caveslug><!--(Required). 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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2018-pf-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 -->
+  <!-- DEBUG  1623-2018-pf-02+1623-2018-pf-02 'Z' == -->
   <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>Paul Fox, Natalie Uominie</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/2018-pf-02/2018-pf-02.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>/logbookentry/2018-08-08/t2018-08-08_plateau_to</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. -->
 <equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
 <references>apparently no scans done</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
@@ -47,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
-<survex_file>caves-1623/2018-pf-02/2018-pf-02.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2018-pf-02</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
diff --git a/cave_data/1623-2023-JSS-01.html b/cave_data/1623-2023-JSS-01.html
index d9e6c84c5..4a030d72a 100644
--- a/cave_data/1623-2023-JSS-01.html
+++ b/cave_data/1623-2023-JSS-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:48 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:56 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:48 a.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:56 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -40,7 +40,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <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 -->
-  <!-- DEBUG  1623-2023-jss-01+1623-2023-jss-01 'Z' == -->
+  <!-- DEBUG  1623-2023-JSS-01+1623-2023-JSS-01 'Z' == -->
   <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-2023-KT-01.html b/cave_data/1623-2023-KT-01.html
index ae7d956d3..a12028d20 100644
--- a/cave_data/1623-2023-KT-01.html
+++ b/cave_data/1623-2023-KT-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:57 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:57 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2023-KT-02.html b/cave_data/1623-2023-KT-02.html
index f3bdb1eb8..5630bdd95 100644
--- a/cave_data/1623-2023-KT-02.html
+++ b/cave_data/1623-2023-KT-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:33 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:57 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:33 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:57 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -40,7 +40,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <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 -->
-  <!-- DEBUG  1623-2023-kt-02+1623-2023-kt-02 'Z' == -->
+  <!-- DEBUG  1623-2023-KT-02+1623-2023-KT-02 'Z' == -->
   <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-2023-OK-01.html b/cave_data/1623-2023-OK-01.html
index c36e2a213..557d04c9e 100644
--- a/cave_data/1623-2023-OK-01.html
+++ b/cave_data/1623-2023-OK-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 16, 2023, 10:43 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:52 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 16, 2023, 10:43 a.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:52 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2023-RAWDB-01.html b/cave_data/1623-2023-RAWDB-01.html
index b55a2addb..12fae2e42 100644
--- a/cave_data/1623-2023-RAWDB-01.html
+++ b/cave_data/1623-2023-RAWDB-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:41 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:41 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2023-RAWDB-02.html b/cave_data/1623-2023-RAWDB-02.html
index 640a7cfaa..330138dfb 100644
--- a/cave_data/1623-2023-RAWDB-02.html
+++ b/cave_data/1623-2023-RAWDB-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:59 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:42 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:59 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:42 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2023-ft-01.html b/cave_data/1623-2023-ft-01.html
index a3f264721..e453439cc 100644
--- a/cave_data/1623-2023-ft-01.html
+++ b/cave_data/1623-2023-ft-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 26, 2023, 4:13 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:23 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 26, 2023, 4:13 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:23 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -19,7 +19,7 @@ the form documented at
 <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-ft-01</caveslug><!--(Required). 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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2023-ft-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.  -->
+  <!-- DEBUG  1623-2023-ft-01+1623-2023-ft-01A 'Z' == -->
+  <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>Frank Tully</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/2023-ft-01/2023-ft-01.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file>caves-1623/2023-ft-01/2023-ft-01.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>Pointless cave recorded so it does not get recorded again. Sort of a test.</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. -->
 <equipment>Helmet</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
 <references>The Iliad</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
diff --git a/cave_data/1623-2023-ft-02.html b/cave_data/1623-2023-ft-02.html
index 7071bfac7..b2a5199fe 100644
--- a/cave_data/1623-2023-ft-02.html
+++ b/cave_data/1623-2023-ft-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 26, 2023, 4:11 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:22 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 26, 2023, 4:11 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:22 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -19,7 +19,7 @@ the form documented at
 <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-ft-02</caveslug><!--(Required). 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>Mahlstrom</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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <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 -->
+  <!-- DEBUG  1623-2023-ft-02+1623-2023-ft-02 'Z' == -->
   <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>Flo, Max, Frank</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/2023-ft-02/2023-ft-02.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file>caves-1623/2023-ft-02/2023-ft-02.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>Shaft which has development at the bottom</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. -->
 <equipment>SRT, spinach</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
 <references>The dictionary</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
diff --git a/cave_data/1623-2023-hbrw-04.html b/cave_data/1623-2023-hbrw-04.html
index dfe24a0a8..464b05ee8 100644
--- a/cave_data/1623-2023-hbrw-04.html
+++ b/cave_data/1623-2023-hbrw-04.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:21 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:21 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-haldenloch.html b/cave_data/1623-haldenloch.html
index 3a95bf0f7..5527842b8 100644
--- a/cave_data/1623-haldenloch.html
+++ b/cave_data/1623-haldenloch.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:48 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 -->
 <!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <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 Oct. 10, 2023, 7:48 p.m. UTC 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><!-- '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-haldenloch</caveslug><!--(Required). 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>Haldenloch</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck--><!-- Name of the cave (normally in German) -->
-<area>1623</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<official_name>Haldenloch</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
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-haldenloch</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 -->
+  <!-- DEBUG  1623-haldenloch+1623-haldenloch 'Z' == -->
   <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></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/haldenloch/haldenloch.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>date 2008.09.10
 ; Hinterland, Peters Schlufeloch mit Tunnel, neben Fliffis
 Area 1623
@@ -51,7 +60,7 @@ No description or location</underground_description><!-- Underground description
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
-<survex_file>caves-1623/haldenloch/haldenloch.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/haldenloch</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
diff --git a/cave_data/1623-rentner.html b/cave_data/1623-rentner.html
index 848513c07..751dba54a 100644
--- a/cave_data/1623-rentner.html
+++ b/cave_data/1623-rentner.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 6, 2023, 9:54 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:19 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 6, 2023, 9:54 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:19 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -19,7 +19,7 @@ the form documented at
 <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-rentner</caveslug><!--(Required). 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>Rentner-Express</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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-rentner</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 -->
+  <!-- DEBUG  1623-rentner+1623-rentner 'Z' == -->
   <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></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/rentner/rentner.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file>caves-1623/rentner/rentner.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><pre>
 rentner-1
 rentner-1-14
diff --git a/cave_data/1626-2023-BL-09.html b/cave_data/1626-2023-BL-09.html
index 17a4c4bb8..7736a16f3 100644
--- a/cave_data/1626-2023-BL-09.html
+++ b/cave_data/1626-2023-BL-09.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:30 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:30 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1626-361.html b/cave_data/1626-361.html
index 922837ecb..0c4456734 100644
--- a/cave_data/1626-361.html
+++ b/cave_data/1626-361.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 27, 2023, 12:48 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:57 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 1623-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
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 27, 2023, 12:48 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:57 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -19,7 +19,7 @@ the form documented at
 <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>1626-361</caveslug><!--(Required). 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>Hübel-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>1626</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1626</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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1626-361</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 -->
+  <!-- DEBUG  1626-361+1626-361 'Z' == -->
   <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>Thomas Holder, Helmut Stopka-Ebeler, Katharina Bitzer</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-1626/361/361.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file>caves-1626/361/361.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></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. -->
 <equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
 <references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
diff --git a/entrance_data/1623-2010-06.html b/entrance_data/1623-2010-06.html
index ffe9c8f9b..886a862a1 100644
--- a/entrance_data/1623-2010-06.html
+++ b/entrance_data/1623-2010-06.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 7, 2023, 8:59 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:57 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 7, 2023, 8:59 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:57 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -47,8 +47,8 @@ though, you do not need to do a data import as it happens automatically -->
 <findability>S</findability>
 <findability_description></findability_description>
 <alt>1864</alt>
-<northing>411503</northing>
-<easting>5283072</easting> 
+<northing>5283072</northing>
+<easting>411503</easting> 
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station>1623.p2010-06</tag_station>
diff --git a/entrance_data/1623-2010-07.html b/entrance_data/1623-2010-07.html
index 1a755197d..3be3f4583 100644
--- a/entrance_data/1623-2010-07.html
+++ b/entrance_data/1623-2010-07.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 10, 2023, 11:56 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:57 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 10, 2023, 11:56 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:57 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -61,9 +61,9 @@ GPS 33T UTM</location_description>
 <findability>S</findability>
 <findability_description></findability_description>
 <alt>1832m</alt>
-<northing>411441</northing>
-<easting>5283142</easting> 
-<lat_wgs84></lat_wgs84> 
+<northing>5283142</northing>
+<easting></easting> 
+<lat_wgs84>411441</lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station>1623.p2010-07</tag_station>
 <exact_station></exact_station>
diff --git a/entrance_data/1623-2012-ft-01.html b/entrance_data/1623-2012-ft-01.html
index ffbb710db..548706f23 100644
--- a/entrance_data/1623-2012-ft-01.html
+++ b/entrance_data/1623-2012-ft-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 7, 2023, 9:06 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:48 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 7, 2023, 9:06 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:48 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -47,8 +47,8 @@ though, you do not need to do a data import as it happens automatically -->
 <findability>R</findability>
 <findability_description></findability_description>
 <alt>1930</alt>
-<northing>0411983</northing>
-<easting>5283592</easting> 
+<northing>5283592</northing>
+<easting>0411983</easting> 
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station></tag_station>
diff --git a/entrance_data/1623-2012-ft-02.html b/entrance_data/1623-2012-ft-02.html
index dce930944..f076dbff3 100644
--- a/entrance_data/1623-2012-ft-02.html
+++ b/entrance_data/1623-2012-ft-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 7, 2023, 9:23 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:53 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 7, 2023, 9:23 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:53 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -47,8 +47,8 @@ though, you do not need to do a data import as it happens automatically -->
 <findability>S</findability>
 <findability_description></findability_description>
 <alt>1911</alt>
-<northing>0411928</northing>
-<easting>5283570</easting> 
+<northing>5283570</northing>
+<easting>0411928</easting> 
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station></tag_station>
diff --git a/entrance_data/1623-2012-ns-03.html b/entrance_data/1623-2012-ns-03.html
index b6b1e9d07..b5cf9b0a9 100644
--- a/entrance_data/1623-2012-ns-03.html
+++ b/entrance_data/1623-2012-ns-03.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 10, 2023, 6:37 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:55 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:37 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:55 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -47,8 +47,8 @@ though, you do not need to do a data import as it happens automatically -->
 <findability>S</findability>
 <findability_description>Co-ords in UTM, need converting</findability_description>
 <alt>1885</alt>
-<northing>0411650</northing>
-<easting>5233408</easting> 
+<northing>5233408</northing>
+<easting>0411650</easting> 
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
 <tag_station>1623.p2012-ns-03</tag_station>
diff --git a/entrance_data/1623-2014-BL888.html b/entrance_data/1623-2014-BL888.html
index 3b5bd3bd7..9af178f02 100644
--- a/entrance_data/1623-2014-BL888.html
+++ b/entrance_data/1623-2014-BL888.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:43 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:43 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -53,7 +53,7 @@ though, you do not need to do a data import as it happens automatically -->
 <long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station>1623.p2014-BL888</other_station>
+<other_station>1623.p2014-bl888</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2018-MS-01.html b/entrance_data/1623-2018-MS-01.html
index b67f7b2c7..72e66375c 100644
--- a/entrance_data/1623-2018-MS-01.html
+++ b/entrance_data/1623-2018-MS-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 26, 2023, 6:11 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:58 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 26, 2023, 6:11 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:58 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -47,8 +47,10 @@ though, you do not need to do a data import as it happens automatically -->
 <findability></findability>
 <findability_description></findability_description>
 <alt>1698</alt>
-<northing>410730</northing>
-<easting>5274320</easting> 
+<northing>5274320</northing>
+<easting>410730</easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
diff --git a/entrance_data/1623-2018-NTU-02.html b/entrance_data/1623-2018-NTU-02.html
index d8999cbc9..6933e4f86 100644
--- a/entrance_data/1623-2018-NTU-02.html
+++ b/entrance_data/1623-2018-NTU-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:50 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:29 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:50 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:29 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -23,9 +23,10 @@ though, you do not need to do a data import as it happens automatically -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
-<location_description></location_description>
-<lastvisit></lastvisit>
+<map_description>lat long on notes2.jpg in 2018#43, NEEDS TO BE CONVERTED TO A *FIX and an entrance station</map_description>
+<location_description><img width=50% src="/expofiles/surveyscans/2018/2018%2343/notes2.jpg"><br />
+<a href="/expofiles/surveyscans/2018/2018%2343/notes2.jpg">2018#43 notes2.jpg</a></location_description>
+<lastvisit>2018-08-08</lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -49,6 +50,8 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
diff --git a/entrance_data/1623-2018-aa-01.html b/entrance_data/1623-2018-aa-01.html
index 4cd5a29bc..10606beaf 100644
--- a/entrance_data/1623-2018-aa-01.html
+++ b/entrance_data/1623-2018-aa-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 13, 2023, 9 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:54 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 13, 2023, 9 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:54 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -47,8 +47,10 @@ though, you do not need to do a data import as it happens automatically -->
 <findability>S</findability>
 <findability_description>The cave is directly in the path, where a bold step is needed (directly above the pitch) to continue along the path. Altitude is estimated.</findability_description>
 <alt>1800</alt>
-<northing>411271</northing>
-<easting>5282705</easting> 
+<northing></northing>
+<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
 <other_station>1623.p2018-aa-01</other_station>
diff --git a/entrance_data/1623-2018-pf-01.html b/entrance_data/1623-2018-pf-01.html
index a2b06f8f4..5845fdb5c 100644
--- a/entrance_data/1623-2018-pf-01.html
+++ b/entrance_data/1623-2018-pf-01.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:52 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. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:52 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-2018-pf-01</slug>
+<slug>1623-2018-pf-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description>Arriving at the Big Cairn (GPS coords UTM: 33T 0411542, 5282881) which is on the Tunnocks path, we followed the 2005 instructions and veered left on an alleged heading towards the fabled caves 2004-18, 17, and 16 . Directly off the Tunnocks path we got distracted as we came upon 3 shafts which were not on the GPS catalogue: we named them 2018-PF-01 (which we tagged; see our survey of the same day), 2018-PF-02 (which we tagged the next day with Wookey; undescended), and 2018-PF-03 (which Paul tagged some days later)</entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -41,9 +47,11 @@
 <findability></findability>
 <findability_description></findability_description>
 <alt>1857</alt>
-<northing>0411526</northing>
-<easting>5282885</easting> 
-<tag_station></tag_station>
+<northing></northing>
+<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2018-pf-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2018-pf-02.html b/entrance_data/1623-2018-pf-02.html
index d4fa9e924..939d9b07b 100644
--- a/entrance_data/1623-2018-pf-02.html
+++ b/entrance_data/1623-2018-pf-02.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:49 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. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:49 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-2018-pf-02</slug>
+<slug>1623-2018-pf-02</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description>Arriving at the Big Cairn (GPS coords UTM: 33T 0411542, 5282881) which is on the Tunnocks path, we followed the 2005 instructions and veered left on an alleged heading towards the fabled caves 2004-18, 17, and 16 . Directly off the Tunnocks path we got distracted as we came upon 3 shafts which were not on the GPS catalogue: we named them 2018-PF-01 (which we tagged; see our survey of the same day), 2018-PF-02 (which we tagged the next day with Wookey; undescended),</location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -41,9 +47,11 @@
 <findability></findability>
 <findability_description></findability_description>
 <alt></alt>
-<northing>0411540</northing>
-<easting>5282900</easting> 
-<tag_station></tag_station>
+<northing>5282900</northing>
+<easting>0411540</easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2018-pf-02</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-JSS-01.html b/entrance_data/1623-2023-JSS-01.html
index 9d09df895..d369847a7 100644
--- a/entrance_data/1623-2023-JSS-01.html
+++ b/entrance_data/1623-2023-JSS-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:06 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:56 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:06 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:56 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-jss-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description>/logbookentry/2023-07-24/2023-07-24b</other_description>
diff --git a/entrance_data/1623-2023-KT-01.html b/entrance_data/1623-2023-KT-01.html
index 4d503181b..043e63c25 100644
--- a/entrance_data/1623-2023-KT-01.html
+++ b/entrance_data/1623-2023-KT-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 22, 2023, 11:52 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:57 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 22, 2023, 11:52 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:57 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-kt-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-KT-02.html b/entrance_data/1623-2023-KT-02.html
index 4e7095189..f6a47b0b7 100644
--- a/entrance_data/1623-2023-KT-02.html
+++ b/entrance_data/1623-2023-KT-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:33 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:57 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:33 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:57 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-kt-02</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-OK-01.html b/entrance_data/1623-2023-OK-01.html
index 40de59a02..fb02b5a8c 100644
--- a/entrance_data/1623-2023-OK-01.html
+++ b/entrance_data/1623-2023-OK-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Sept. 16, 2023, 10:43 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:52 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 16, 2023, 10:43 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:52 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,6 +49,8 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84>47.69578</lat_wgs84> 
+<long_wgs84>13.80463</long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
diff --git a/entrance_data/1623-2023-RAWDB-01.html b/entrance_data/1623-2023-RAWDB-01.html
index d98a68519..240edcdcb 100644
--- a/entrance_data/1623-2023-RAWDB-01.html
+++ b/entrance_data/1623-2023-RAWDB-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Aug. 5, 2023, 10:10 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:41 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Aug. 5, 2023, 10:10 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:41 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-rawdb-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-RAWDB-02.html b/entrance_data/1623-2023-RAWDB-02.html
index 57653bc63..981471042 100644
--- a/entrance_data/1623-2023-RAWDB-02.html
+++ b/entrance_data/1623-2023-RAWDB-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Sept. 15, 2023, 8:59 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:42 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Sept. 15, 2023, 8:59 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:42 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-rawdb-02</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-ft-01A.html b/entrance_data/1623-2023-ft-01A.html
index 4a3ef1d93..4dac27781 100644
--- a/entrance_data/1623-2023-ft-01A.html
+++ b/entrance_data/1623-2023-ft-01A.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 25, 2023, 8:54 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:23 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 25, 2023, 8:54 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:23 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt>1690.0</alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-ft-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-ft-02.html b/entrance_data/1623-2023-ft-02.html
index e1bfde2ae..24e44b63a 100644
--- a/entrance_data/1623-2023-ft-02.html
+++ b/entrance_data/1623-2023-ft-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 25, 2023, 10:13 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:22 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 25, 2023, 10:13 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:22 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt>1692</alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-ft-02</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-hbrw-04.html b/entrance_data/1623-2023-hbrw-04.html
index 3d24ea0da..bb9af450a 100644
--- a/entrance_data/1623-2023-hbrw-04.html
+++ b/entrance_data/1623-2023-hbrw-04.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 9, 2023, 10:47 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:21 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 9, 2023, 10:47 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:21 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-hbrw-04</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-haldenloch.html b/entrance_data/1623-haldenloch.html
index 794a76d46..d889a600f 100644
--- a/entrance_data/1623-haldenloch.html
+++ b/entrance_data/1623-haldenloch.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:48 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. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:48 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-haldenloch</slug>
+<slug>1623-haldenloch</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description>Default assumed entrance</entrance_description>
 <explorers></explorers>
 <map_description>no data</map_description>
 <location_description>no data</location_description>
+<lastvisit></lastvisit>
 <approach>no data</approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,7 +49,9 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.haldenloch.eingang.0</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-rentner.html b/entrance_data/1623-rentner.html
index 4e90122c8..03e231583 100644
--- a/entrance_data/1623-rentner.html
+++ b/entrance_data/1623-rentner.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 27, 2023, 12:22 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:19 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 27, 2023, 12:22 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:19 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p-rentner</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1626-2023-BL-09.html b/entrance_data/1626-2023-BL-09.html
index e85aa72e9..5eaa5e67e 100644
--- a/entrance_data/1626-2023-BL-09.html
+++ b/entrance_data/1626-2023-BL-09.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 22, 2023, 10:22 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 8:30 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 22, 2023, 10:22 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 8:30 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,9 +49,11 @@ though, you do not need to do a data import as it happens automatically -->
 <alt>1773</alt>
 <northing>5283515</northing>
 <easting>410178</easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station></other_station>
+<other_station>1623.p2023-BL-09</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1626-361.html b/entrance_data/1626-361.html
index 807d2f160..3cf01a010 100644
--- a/entrance_data/1626-361.html
+++ b/entrance_data/1626-361.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 27, 2023, 12:48 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 7:57 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 -->
@@ -14,7 +14,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on July 27, 2023, 12:48 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 7:57 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1626.361.1.0</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>