diff --git a/cave_data/1623-87.html b/cave_data/1623-87.html
index 53f336a5c..11ab8b4ca 100644
--- a/cave_data/1623-87.html
+++ b/cave_data/1623-87.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:16 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on June 6, 2024, 10:57 a.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,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
 <!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
@@ -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 Nov. 2, 2023, 8:16 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on June 6, 2024, 10:57 a.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -36,17 +36,15 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>87</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number></unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number></unofficial_number><!-- (This is any name. Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
   <entranceslug>1623-87a</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-87+1623-87a 'Z' =a= -->
   <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
 <entrance>
   <entranceslug>1623-87b</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-87+1623-87b 'Z' =b= -->
   <letter>b</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>
 
@@ -56,15 +54,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <survey>? MISSING (grade 5)</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes>The 1987 logbook suggests we changed this to 87b and the cave that had mistakenly been numbered 88, called 87b on this site, we called 87a, so we had better look into the labelling at the entrance 87a and put an 87b metal tag just inside 87b in the stogerweg.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<notes>The 1987 logbook suggests we changed this to 87b and the cave that had mistakenly been numbered 88, called 87b on this site, we called 87a, so we had better look into the labelling at the entrance 87a and put an 87b metal tag just inside 87b in the stogerweg.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost, and whether a kataster form has been sent to Austria for this cave -->
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>111.5m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/87/87.html</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>
 </body>
 </html>
diff --git a/entrance_data/1623-87b.html b/entrance_data/1623-87b.html
index af366ece1..5c7224a7c 100644
--- a/entrance_data/1623-87b.html
+++ b/entrance_data/1623-87b.html
@@ -1,20 +1,31 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- This file is generated by troggle on June 6, 2024, 10:57 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this file by hand, and manually upload it to the server using git,
+make sure you update the database by doing a full data import. If you edit it using the online form
+though, you do not need to do a data import as it happens automatically -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on June 6, 2024, 10:57 a.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-87b</slug>
+<slug>1623-87b</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
-<location_description><i>In</i> Stogerweg - you literally step over it while walking along the path.</p><p>Originally numbered '88' in a fit of optimism while the explorer was getting changed to investigate this impressively draughting hole, it proved in fact to be only 1.2 metres deep and too tight. It appears to be above the inlet below pitch 1 in cave 87, and has been officially renumbered 87b (the painted "88" had faded to near-illegibility by 2018), since the Austrians have allocated number 88 to L&auml;rchenh&ouml;hle. </location_description>
-<approach>on the Stogerweg path</approach>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
 <underground_description></underground_description>
 <photo></photo>
 <!-- marking options: P  = Paint,
@@ -32,17 +43,15 @@
                           S = Surveyed,
                           L = Lost,
                           R = Refindable" -->
-<findability>R</findability>
-<findability_description>Easily refindable, it's right on the Stogerweg path. Very faded "88" just visible in 10cm high digits.</findability_description>
+<findability>?</findability>
+<findability_description></findability_description>
 <alt>circa 1505m</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>
 <other_description></other_description>
-<bearings></bearings>
-<url></url>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
