diff --git a/cave_data/1626-33.html b/cave_data/1626-33.html
index 9142652a4..aa760bec4 100644
--- a/cave_data/1626-33.html
+++ b/cave_data/1626-33.html
@@ -1,85 +1,49 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on June 28, 2024, 7:48 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- 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 June 28, 2024, 7:48 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
 
 <cave>
-<non_public>False</non_public><!-- '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-33</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Horizontalteil</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><!-- 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
+<non_public>False</non_public>
+<unexplored>False</unexplored>
 
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number>33</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<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'-->
+<official_name>Loutotihöhle</official_name>
+<area>1626</area>
+<kataster_code></kataster_code>
+<kataster_number>33</kataster_number> 
+<unofficial_number></unofficial_number>
 
 <entrance>
-  <entranceslug>1626-33</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1626-33</entranceslug>
+  <letter></letter>
 </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-1626/33/33.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>not-CUCC-Expo cave.<br>3 lines of the survexfile, then all the *begin lines:<br><pre>*begin 33
-*begin Horizontalteil
-*begin 1
-
-*begin 11
-*begin 12
-*begin 15
-*begin 16
-*begin 17
-*begin 18
-*begin 19
-*begin 2
-*begin 21
-*begin 22
-*begin 23
-*begin 25
-*begin 26
-*begin 27
-*begin 3
-*begin 5
-*begin 6
-*begin 7
-*begin 8
-</pre></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. -->
-<survey></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. -->
-<notes>This is  an ARGE cave where we only have the survex file an entrance fix <br>
+<explorers></explorers>
+<survex_file>caves-1626/33/33.svx</survex_file>
+<underground_description></underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes>This is  an ARGE cave where we only have the survex file and entrance fix <br>
 *fix 33.Horizontalteil.1.2 36290.98 86210.55 1815.31
-<br>and no other information</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></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<br>and no other information</notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-casino-01.html b/cave_data/1626-casino-01.html
deleted file mode 100644
index cb34f4bd1..000000000
--- a/cave_data/1626-casino-01.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:15 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
-<!-- Only put one cave in this file -->
-<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
-make sure you update the database by doing a full data import. If you edit it using the online form
-though, you do not need to do a data import as it happens automatically -->
-<!-- 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 hand edited.
-
-the form is 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. -->
-<official_name>Casino</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-->
-<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
-
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   erforscht (exploration considered complete)
- -->
-<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>casino-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
-
-<entrance>
-  <entranceslug>1626-casino-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 -->
-  <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>not-CUCC-Expo, 2007</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/casino-01/casino.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. -->
-<survey>; Höhle: Casino , zwischen Rauchfang und Hohem Augsteck</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>We have only the survex file</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-
-</cave>
-</body>
-</html>
diff --git a/cave_data/1626-loutoti-01.html b/cave_data/1626-loutoti-01.html
deleted file mode 100644
index 3020e1ae6..000000000
--- a/cave_data/1626-loutoti-01.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
-<!-- Only put one cave in this file -->
-<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
-make sure you update the database by doing a full data import. If you edit it using the online form
-though, you do not need to do a data import as it happens automatically -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<b>This file is generated by troggle</b> using the form documented at
-the form documented at 
-<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
-<br>
-
-<cave>
-<non_public>False</non_public>
-<unexplored>False</unexplored>
-
-<official_name>Loutotihöhle</official_name>
-<area>1626</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>loutoti-01</unofficial_number>
-
-<entrance>
-  <entranceslug>1626-loutoti-01</entranceslug>
-  <letter></letter>
-</entrance>
-
-<explorers></explorers>
-<survex_file>caves-1626/33/33.svx</survex_file>
-<underground_description></underground_description>
-<equipment></equipment>
-<references></references>
-<survey></survey>
-<notes>We only have the survex files.</notes>
-<length></length>
-<depth></depth>
-<extent></extent>
-
-<description_file></description_file>
-</cave>
-</body>
-</html>
diff --git a/entrance_data/1626-33.html b/entrance_data/1626-33.html
index dc844d311..e041b1897 100644
--- a/entrance_data/1626-33.html
+++ b/entrance_data/1626-33.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on June 28, 2024, 7:48 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 7, 2023, 9:39 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,17 +14,16 @@ 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 June 28, 2024, 7:48 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 7, 2023, 9:39 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> ignored, not needed. Now using filename -->
- <!-- <slug> ignored, not needed. Now using filename -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<location_description>(*fix presumably created by Becka from katraster online?)</location_description>
+<map_description></map_description>
+<location_description></location_description>
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
@@ -44,15 +43,25 @@ though, you do not need to do a data import as it happens automatically -->
                           S = Surveyed,
                           L = Lost,
                           R = Refindable" -->
-<findability>S</findability>
+<findability></findability>
 <findability_description></findability_description>
 <alt></alt>
+<northing></northing>
+<easting></easting> 
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
-<tag_station>1626.33.Horizontalteil.1.2</tag_station>
+<tag_station>1626.33.LT-Eingang.1</tag_station>
+<exact_station></exact_station>
 <other_station></other_station>
+
+<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. -->
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<survey></survey>
+
 <other_description></other_description>
-<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
+<bearings></bearings>
+<url></url>
 </entrance>
 </body>
 </html>
diff --git a/entrance_data/1626-casino-01.html b/entrance_data/1626-casino-01.html
deleted file mode 100644
index 333a2867d..000000000
--- a/entrance_data/1626-casino-01.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 7, 2023, 9:51 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. -->
-    <!-- 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 Oct. 7, 2023, 9:51 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>
-<name></name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<map_description></map_description>
-<location_description></location_description>
-<lastvisit>2007.07.30</lastvisit>
-<approach></approach>
-<underground_description></underground_description>
-<photo></photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>?</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability></findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<lat_wgs84></lat_wgs84> 
-<long_wgs84></long_wgs84> 
-<tag_station>1626.casino.0</tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>
diff --git a/entrance_data/1626-loutoti-01.html b/entrance_data/1626-loutoti-01.html
deleted file mode 100644
index bb9ec46bd..000000000
--- a/entrance_data/1626-loutoti-01.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 7, 2023, 9:39 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. -->
-    <!-- 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 Oct. 7, 2023, 9:39 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>
-<name></name>
-<entrance_description></entrance_description>
-<explorers></explorers>
-<map_description></map_description>
-<location_description></location_description>
-<lastvisit></lastvisit>
-<approach></approach>
-<underground_description></underground_description>
-<photo></photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>?</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability></findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<lat_wgs84></lat_wgs84> 
-<long_wgs84></long_wgs84> 
-<tag_station>1626.lou-toti.LT-Eingang.1</tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-
-<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. -->
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<survey></survey>
-
-<other_description></other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>
