diff --git a/1623/2023-hbrw-01/i/2023-hbrw-01-sketch-w.jpg b/1623/321/i/2023-hbrw-01-sketch-w.jpg
similarity index 100%
rename from 1623/2023-hbrw-01/i/2023-hbrw-01-sketch-w.jpg
rename to 1623/321/i/2023-hbrw-01-sketch-w.jpg
diff --git a/1623/2023-hbrw-01/i/2023-hbrw-01-sketch.jpg b/1623/321/i/2023-hbrw-01-sketch.jpg
similarity index 100%
rename from 1623/2023-hbrw-01/i/2023-hbrw-01-sketch.jpg
rename to 1623/321/i/2023-hbrw-01-sketch.jpg
diff --git a/1623/i/small_drain_entrance.jpg b/1623/321/i/small_drain_entrance.jpg
similarity index 100%
rename from 1623/i/small_drain_entrance.jpg
rename to 1623/321/i/small_drain_entrance.jpg
diff --git a/1623/2023-hbrw-01/l/2023-hbrw-01-sketch-w.html b/1623/321/l/2023-hbrw-01-sketch-w.html
similarity index 80%
rename from 1623/2023-hbrw-01/l/2023-hbrw-01-sketch-w.html
rename to 1623/321/l/2023-hbrw-01-sketch-w.html
index 3b5846921..ae55e9256 100644
--- a/1623/2023-hbrw-01/l/2023-hbrw-01-sketch-w.html
+++ b/1623/321/l/2023-hbrw-01-sketch-w.html
@@ -10,7 +10,7 @@ Plan
 
 <body>
 <H1>Plan</H1>
-<div class="centre"><img alt="" src="/1623/2023-hbrw-01/i/2023-hbrw-01-sketch-w.jpg" />
+<div class="centre"><img alt="" src="../i/2023-hbrw-01-sketch-w.jpg" />
 </div>
 
 <p>d</p>
diff --git a/1623/2023-hbrw-01/l/2023-hbrw-01-sketch.html b/1623/321/l/2023-hbrw-01-sketch.html
similarity index 80%
rename from 1623/2023-hbrw-01/l/2023-hbrw-01-sketch.html
rename to 1623/321/l/2023-hbrw-01-sketch.html
index e3ea6fefc..b01eb9dfb 100644
--- a/1623/2023-hbrw-01/l/2023-hbrw-01-sketch.html
+++ b/1623/321/l/2023-hbrw-01-sketch.html
@@ -10,7 +10,7 @@ Plan
 
 <body>
 <H1>Plan</H1>
-<div class="centre"><img alt="" src="/1623/2023-hbrw-01/i/2023-hbrw-01-sketch.jpg" />
+<div class="centre"><img alt="" src="../i/2023-hbrw-01-sketch.jpg" />
 </div>
 
 <p>d</p>
diff --git a/1623/l/small_drain_entrance.html b/1623/321/l/small_drain_entrance.html
similarity index 86%
rename from 1623/l/small_drain_entrance.html
rename to 1623/321/l/small_drain_entrance.html
index e58473393..4f15aef29 100644
--- a/1623/l/small_drain_entrance.html
+++ b/1623/321/l/small_drain_entrance.html
@@ -10,7 +10,7 @@ small_drain_entrance
 
 <body>
 <H1>small_drain_entrance</H1>
-<div class="centre"><img alt="" src="/1623/i/small_drain_entrance.jpg" />
+<div class="centre"><img alt="" src="../i/small_drain_entrance.jpg" />
 </div>
 
 <p>small drain entrance</p>
diff --git a/1623/2023-hbrw-01/t/2023-hbrw-01-sketch-w.jpg b/1623/321/t/2023-hbrw-01-sketch-w.jpg
similarity index 100%
rename from 1623/2023-hbrw-01/t/2023-hbrw-01-sketch-w.jpg
rename to 1623/321/t/2023-hbrw-01-sketch-w.jpg
diff --git a/1623/2023-hbrw-01/t/2023-hbrw-01-sketch.jpg b/1623/321/t/2023-hbrw-01-sketch.jpg
similarity index 100%
rename from 1623/2023-hbrw-01/t/2023-hbrw-01-sketch.jpg
rename to 1623/321/t/2023-hbrw-01-sketch.jpg
diff --git a/1623/t/small_drain_entrance.jpg b/1623/321/t/small_drain_entrance.jpg
similarity index 100%
rename from 1623/t/small_drain_entrance.jpg
rename to 1623/321/t/small_drain_entrance.jpg
diff --git a/cave_data/1623-321.html b/cave_data/1623-321.html
index 438244537..b387af53f 100644
--- a/cave_data/1623-321.html
+++ b/cave_data/1623-321.html
@@ -1,61 +1,49 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on June 8, 2024, 9:30 a.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 8, 2024, 9:30 a.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. -->
-<official_name>Kleiner Abfluss 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-->
-<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>
 
-    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>321</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-hbrw-01</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>Kleiner Abfluss Höhle</official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number>321</kataster_number> 
+<unofficial_number>2023-hbrw-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-321</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>1623-321</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Radost Waszkiewicz, Honorata Bogusz</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/321/321.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><a href='/1623/2023-hbrw-01/l/2023-hbrw-01-sketch-w.html'><img src='/1623/2023-hbrw-01/i/2023-hbrw-01-sketch-w.jpg' /></a>
+<explorers>Radost Waszkiewicz, Honorata Bogusz</explorers>
+<survex_file>caves-1623/321/321.svx</survex_file>
+<underground_description><a href='/1623/321/l/2023-hbrw-01-sketch-w.html'><img src='/1623/321/i/2023-hbrw-01-sketch-w.jpg' /></a>
 <p></p>
 
-Entrance is at the north side of a larger depression. Inside you immediately hit a junction, a narrow and very pointy vadose passage continues to the left, an awkward climb down to the right leads to a small room which has a small stream on the floor in wet conditions (the cave was explored whilst it was raining). Water originates in a tight crack in the roof of the room, goes across the room and disappears in the floor on the other side.</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>10m rope</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>Small cave with a small stream at the bottom. One junction.</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)  -->
+Entrance is at the north side of a larger depression. Inside you immediately hit a junction, a narrow and very pointy vadose passage continues to the left, an awkward climb down to the right leads to a small room which has a small stream on the floor in wet conditions (the cave was explored whilst it was raining). Water originates in a tight crack in the roof of the room, goes across the room and disappears in the floor on the other side.</underground_description>
+<equipment>10m rope</equipment>
+<references></references>
+<survey></survey>
+<notes>Small cave with a small stream at the bottom. One junction.</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/entrance_data/1623-321.html b/entrance_data/1623-321.html
index d3171f289..daeb0d0fe 100644
--- a/entrance_data/1623-321.html
+++ b/entrance_data/1623-321.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on June 8, 2024, 9:30 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle  using the form documented at handbook/survey/ententry.html -->
 <!-- If you edit this file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
@@ -14,13 +14,12 @@ 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 8, 2024, 9:30 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b>  using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
 <non_public>False</non_public>
- <!-- <slug> ignored, not needed. Now using filename -->
- <!-- <slug> ignored, not needed. Now using filename -->
+<slug>1623-321</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
@@ -28,7 +27,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo><a href='/1623/l/small_drain_entrance.html'><img src='/1623/t/small_drain_entrance.jpg' /></a></photo>
+<photo><a href='/1623/321/l/small_drain_entrance.html'><img src='/1623/321/t/small_drain_entrance.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
