diff --git a/cave_data/1623-297.html b/cave_data/1623-297.html
index 0cb80f7e2..a43415383 100644
--- a/cave_data/1623-297.html
+++ b/cave_data/1623-297.html
@@ -1,40 +1,56 @@
 <!DOCTYPE html>
+<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- 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>
 <cave>
-<non_public>False</non_public>
-<caveslug>1623-297</caveslug>
-<official_name>Haizahnh&ouml;hle</official_name>
-<area>1623</area>
-<kataster_code></kataster_code>
-<kataster_number>297</kataster_number> 
-<unofficial_number>2012-dd-08</unofficial_number>
+<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-297</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>Haizahnh&ouml;hle</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 -->
+<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>297</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2012-dd-08</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>1623-297</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-297</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>CUCC, (Duncan Collis and Anthony Day, 2012-08-10; Chris Densham, Frank Tully, Anthony Day, Todd Rye 2018-07-11)</explorers>
-<underground_description>5m diameter phreatic tube opens out after 20 m.
-Three low passages on left interconnect and choke. Up slope to right leads to narrow descending rift. Opens out at bottom into phreas but ckokes directly ahead. Draft reported in 2012. Name relates to shark-tooth-like popcorn formations.</underground_description>
-<equipment></equipment>
-<references></references>
-<survey><img src="297/i/plan.png" width="600px"/></survey>
+<explorers>CUCC, (Duncan Collis and Anthony Day, 2012-08-10; Chris Densham, Frank Tully, Anthony Day, Todd Rye 2018-07-11)</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. -->
+<underground_description>5m diameter phreatic tube opens out after 20 m.
+Three low passages on left interconnect and choke. Up slope to right leads to narrow descending rift. Opens out at bottom into phreas but ckokes directly ahead. Draft reported in 2012. Name relates to shark-tooth-like popcorn formations.</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><img src="i/plan.png" width="600px"/></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>
-<notes></notes>
-<length></length>
-<depth></depth>
+<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></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<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></survex_file>
-<description_file></description_file>
-<url>1623/297/297.html</url>
+<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 -->
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<url>1623/297/297.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-297.html b/entrance_data/1623-297.html
index dd3161c3e..f0fdda67b 100644
--- a/entrance_data/1623-297.html
+++ b/entrance_data/1623-297.html
@@ -1,6 +1,12 @@
 <!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 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 -->
+
+    <!-- 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"/>
@@ -14,9 +20,9 @@
 <explorers>CUCC, Duncan Collis and Anthony Day, 2012-08-10</explorers>
 <map_description></map_description>
 <location_description>East of summit of Hohes Augst Eck, south of 2012-dd-06 and 07 and a little higher up.</location_description>
-<approach>Via summit of Hohes Augst Eck </approach>
+<approach>Via summit of Hohes Augst Eck</approach>
 <underground_description></underground_description>
-<photo><img src="297/i/entrance.jpg" width="600px"/></photo>
+<photo><img src="i/entrance.jpg" width="600px"/></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/infodx.htm b/infodx.htm
index 98ef2ed7e..d12142ae1 100644
--- a/infodx.htm
+++ b/infodx.htm
@@ -13,8 +13,8 @@
 <ul>
   <li><a href="indxal.htm">Cave Descriptions Index</a>.  Recently-explored major caves:
     <ul>
-    <li><a href="1623/290/">Fischgesicht-H&ouml;hle </a> - FishFace</li>
-    <li><a href="1626/359/">Heimkehrh&ouml;hle </a> - Homecoming</li>
+    <li><a href="1623/290/290.html">Fischgesicht-H&ouml;hle </a> - FishFace</li>
+    <li><a href="1626/359/359.html">Heimkehrh&ouml;hle </a> - Homecoming</li>
     <li><a href="1623/264/264.html">Balkonh&ouml;hle</a></li>
     <li><a href="1623/258/258.html">Tunnockschacht</a></li>
     <li><a href="1623/40/cucc.htm">Schwarzmooskogeleish&ouml;hle</a></li>
