diff --git a/cave_data/1623-170.html b/cave_data/1623-170.html
index d867f5e85..32611d76c 100644
--- a/cave_data/1623-170.html
+++ b/cave_data/1623-170.html
@@ -11,9 +11,9 @@
 <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-170</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>LA25</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) -->
+<official_name>LUSS/LA25</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'
+<kataster_code>2/S +</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)
@@ -29,27 +29,27 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>170</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2020-XX-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'-->
+<unofficial_number>LA25</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-170</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><p></p></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></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><p></p></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><p></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey><p></p></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. -->
+<explorers>LUSS 1987-8</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>A tricky 4m climb down to a ledge and further 2m drop gain the floor of a chamber. Down boulder slope in chamber leads to a further short climb on overhanging loose rubble to a small chamber with draughting rift. A squeeze through the rift opens directly onto the head of an awkward 8m pitch. Beyond, the floor soon disappears and way on is 5m of traverse in a widening rift to where stones fall free for 5 seconds, this was the 1987 terminus.</p><p>A 6m drop reaches a point overlooking a 5m wide circular shaft. Bolts for a Y-hang lead onto the 56m free-hanging <b>Heart of Gold</b> pitch, named for its cross section. Another 10m drop on the other side of a boulder lands on a large ledge covered in loose boulders, <b>The Italian Bistro</b>. Awkward rigging on the right wall and two lower bolts allow <b>Deep Thought</b> to be rigged just clear of the tottering boulders that give the 18m pitch its name.</p><p>At the base is <b>The Restaurant at the End of the Cave</b>, a large chamber sporting five waterfalls. From the foot of the pitch, the floor is steeply inclined up to an arch, beyond which the chamber continues to rise to a total length of about 50m. A debris slope up to a tube at the highest points leads only to a choke. There is no other way on from the Restaurant since the floor is choke by major collapse at a depth of 117m.</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>The above description is taken from the LUSS <a href="../others/luss/index.htm">reports</a> on the 1987 and 1988 expeditions.</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey>A4 elev/plan to grade 5b, LUSS 1987-8</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>201m long cave with a depth of 117m</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)  -->
+<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>201m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>117m</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><!-- 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/170/170.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')-->
+<url>1623/la25.htm</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/cave_data/1623-LA25.html b/cave_data/1623-LA25.html
deleted file mode 100644
index 40753a5db..000000000
--- a/cave_data/1623-LA25.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!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 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><!-- '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-LA25</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>LUSS/LA25</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>2/S +</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>LA25</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-LA25</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>LUSS 1987-8</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>A tricky 4m climb down to a ledge and further 2m drop gain the floor of a chamber. Down boulder slope in chamber leads to a further short climb on overhanging loose rubble to a small chamber with draughting rift. A squeeze through the rift opens directly onto the head of an awkward 8m pitch. Beyond, the floor soon disappears and way on is 5m of traverse in a widening rift to where stones fall free for 5 seconds, this was the 1987 terminus.</p><p>A 6m drop reaches a point overlooking a 5m wide circular shaft. Bolts for a Y-hang lead onto the 56m free-hanging <b>Heart of Gold</b> pitch, named for its cross section. Another 10m drop on the other side of a boulder lands on a large ledge covered in loose boulders, <b>The Italian Bistro</b>. Awkward rigging on the right wall and two lower bolts allow <b>Deep Thought</b> to be rigged just clear of the tottering boulders that give the 18m pitch its name.</p><p>At the base is <b>The Restaurant at the End of the Cave</b>, a large chamber sporting five waterfalls. From the foot of the pitch, the floor is steeply inclined up to an arch, beyond which the chamber continues to rise to a total length of about 50m. A debris slope up to a tube at the highest points leads only to a choke. There is no other way on from the Restaurant since the floor is choke by major collapse at a depth of 117m.</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>The above description is taken from the LUSS <a href="../others/luss/index.htm">reports</a> on the 1987 and 1988 expeditions.</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey>A4 elev/plan to grade 5b, LUSS 1987-8</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></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length>201m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth>117m</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><!-- 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/la25.htm</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-170.html b/entrance_data/1623-170.html
index 782aa5d56..03162e8cc 100644
--- a/entrance_data/1623-170.html
+++ b/entrance_data/1623-170.html
@@ -1,24 +1,22 @@
-<!DOCTYPE html><!-- THIS IS INFO FOR ONE ENTRANCE-->
-<!-- Only put one entrance in this file - if this cave has multiple entrances they are each given a letter and each entrance has a separate file-->
-<!-- If you edit this file, make sure it is uploaded (pushed) to the expoweb repository (entrances folder) and that you have added the cave it enters into the caves folder-->
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title></title>
-<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
 <entrance>
 <non_public>False</non_public>
 <slug>1623-170</slug>
 <name></name>
-<entrance_description></entrance_description>
+<entrance_description>Above the large depression, LA25 is an open, but obscure hole on a bedding shelf.  </entrance_description>
 <explorers></explorers>
 <map_description></map_description>
-<location_description></location_description>
+<location_description>13&deg; 50' 04" E, 47&deg; 42' 04" N</p><p>A large depression on the Hohes Augst-Eck ridge about 1km SSW of Ro&szlig; Kogel, is reached from the crest of the ridge above the obvious rock arch, by following a large snow field to the head of the depression. Contouring around to the south of the depression, following the bedding, LA25 to 27 are close together.</location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><p><div class="centre"></div></p></photo>
+<photo></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -34,9 +32,9 @@
                           S = Surveyed,
                           L = Lost,
                           R = Refindable" -->
-<findability>S</findability>
+<findability>L</findability>
 <findability_description></findability_description>
-<alt></alt>
+<alt>1880m</alt>
 <northing></northing>
 <easting></easting> 
 <tag_station></tag_station>
@@ -47,4 +45,4 @@
 <url></url>
 </entrance>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/entrance_data/1623-LA25.html b/entrance_data/1623-LA25.html
deleted file mode 100644
index f94a9de58..000000000
--- a/entrance_data/1623-LA25.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-LA25</slug>
-<name></name>
-<entrance_description>Above the large depression, LA25 is an open, but obscure hole on a bedding shelf.  </entrance_description>
-<explorers></explorers>
-<map_description></map_description>
-<location_description>13&deg; 50' 04" E, 47&deg; 42' 04" N</p><p>A large depression on the Hohes Augst-Eck ridge about 1km SSW of Ro&szlig; Kogel, is reached from the crest of the ridge above the obvious rock arch, by following a large snow field to the head of the depression. Contouring around to the south of the depression, following the bedding, LA25 to 27 are close together.</location_description>
-<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>L</findability>
-<findability_description></findability_description>
-<alt>1880m</alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings>
-<url></url>
-</entrance>
-</body>
-</html>