diff --git a/cave_data/1624-1.html b/cave_data/1624-1.html
index af3bbd74c..fda11d71d 100644
--- a/cave_data/1624-1.html
+++ b/cave_data/1624-1.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>1</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1624-1</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 -->
@@ -62,7 +62,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 ;Eingang Hihihöhle
 ;Kniegang
 </pre></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 or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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>195</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>26</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent>46</extent>
diff --git a/cave_data/1624-122.html b/cave_data/1624-122.html
index 37c3a53e2..b3df46cd7 100644
--- a/cave_data/1624-122.html
+++ b/cave_data/1624-122.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>122</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
   <entranceslug>1624-122</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 -->
diff --git a/cave_data/1624-138.html b/cave_data/1624-138.html
index 712997d93..88b8b9f05 100644
--- a/cave_data/1624-138.html
+++ b/cave_data/1624-138.html
@@ -52,7 +52,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file and no other information. The name is from 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information. The name is from 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 -->
 <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>
diff --git a/cave_data/1624-162.html b/cave_data/1624-162.html
index 8845fc984..faad556ba 100644
--- a/cave_data/1624-162.html
+++ b/cave_data/1624-162.html
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file and no other information, though it is mentioned in 1624 raw-data</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information, though it is mentioned in 1624 raw-data</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>
diff --git a/cave_data/1624-170.html b/cave_data/1624-170.html
index ac5827e70..dcea74401 100644
--- a/cave_data/1624-170.html
+++ b/cave_data/1624-170.html
@@ -36,7 +36,7 @@ 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>not-CUCC-Expo</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><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
   <entranceslug>1624-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 -->
@@ -56,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1624-190.html b/cave_data/1624-190.html
index 91681be45..90c742345 100644
--- a/cave_data/1624-190.html
+++ b/cave_data/1624-190.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>190</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
   <entranceslug>1624-190</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 -->
diff --git a/cave_data/1626-10.html b/cave_data/1626-10.html
index 61375e07b..61d136e3d 100644
--- a/cave_data/1626-10.html
+++ b/cave_data/1626-10.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>10</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-10</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 -->
@@ -58,7 +58,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-101.html b/cave_data/1626-101.html
index c27749e76..7dd4e56f9 100644
--- a/cave_data/1626-101.html
+++ b/cave_data/1626-101.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>101</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-101</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 -->
@@ -56,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-102.html b/cave_data/1626-102.html
index 8f752681b..604160adb 100644
--- a/cave_data/1626-102.html
+++ b/cave_data/1626-102.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code>-</kataster_code>
 <kataster_number>102</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-102</entranceslug>
@@ -39,7 +39,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-106.html b/cave_data/1626-106.html
index bc1dc5a0a..e44f78336 100644
--- a/cave_data/1626-106.html
+++ b/cave_data/1626-106.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>106</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-106</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 -->
@@ -56,7 +56,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-107.html b/cave_data/1626-107.html
index 56c257e68..aa7eecd65 100644
--- a/cave_data/1626-107.html
+++ b/cave_data/1626-107.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>107</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-107</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 -->
@@ -54,7 +54,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-111.html b/cave_data/1626-111.html
index 66842fcea..0af859946 100644
--- a/cave_data/1626-111.html
+++ b/cave_data/1626-111.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code>-</kataster_code>
 <kataster_number>111</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-111</entranceslug>
@@ -47,7 +47,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-114.html b/cave_data/1626-114.html
index 77ea42905..f7c987983 100644
--- a/cave_data/1626-114.html
+++ b/cave_data/1626-114.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>114</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-114</entranceslug>
@@ -39,7 +39,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-118.html b/cave_data/1626-118.html
index d7a21abdd..9f36cb694 100644
--- a/cave_data/1626-118.html
+++ b/cave_data/1626-118.html
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-13.html b/cave_data/1626-13.html
index 2dabb8c3f..95df3837b 100644
--- a/cave_data/1626-13.html
+++ b/cave_data/1626-13.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>13</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-13</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 -->
@@ -56,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-154.html b/cave_data/1626-154.html
index c4a14511d..94437d5f0 100644
--- a/cave_data/1626-154.html
+++ b/cave_data/1626-154.html
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-155.html b/cave_data/1626-155.html
index d472dc056..94884ac58 100644
--- a/cave_data/1626-155.html
+++ b/cave_data/1626-155.html
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-16.html b/cave_data/1626-16.html
index 3e98208ea..a9f74d01a 100644
--- a/cave_data/1626-16.html
+++ b/cave_data/1626-16.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>16</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-16</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 -->
@@ -84,7 +84,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-164.html b/cave_data/1626-164.html
index b3419ef8d..3504a6bb7 100644
--- a/cave_data/1626-164.html
+++ b/cave_data/1626-164.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>164</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-164</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 -->
@@ -53,7 +53,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-181.html b/cave_data/1626-181.html
index 0ca9c7aa8..bcb3f85be 100644
--- a/cave_data/1626-181.html
+++ b/cave_data/1626-181.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>181</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-181</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 -->
@@ -55,7 +55,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-184.html b/cave_data/1626-184.html
index 000a0eaf0..78bdebc87 100644
--- a/cave_data/1626-184.html
+++ b/cave_data/1626-184.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>184</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-184</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 -->
@@ -56,7 +56,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-185.html b/cave_data/1626-185.html
index c4de4dc7e..d93ad455e 100644
--- a/cave_data/1626-185.html
+++ b/cave_data/1626-185.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>185</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-185</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 -->
@@ -56,7 +56,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-187.html b/cave_data/1626-187.html
index 292be9ee1..c52c38617 100644
--- a/cave_data/1626-187.html
+++ b/cave_data/1626-187.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>187</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-187</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 -->
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-188.html b/cave_data/1626-188.html
index bb461155d..2d271e8e8 100644
--- a/cave_data/1626-188.html
+++ b/cave_data/1626-188.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>188</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-188</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 -->
@@ -53,7 +53,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-189.html b/cave_data/1626-189.html
index a42377f0c..f328d377b 100644
--- a/cave_data/1626-189.html
+++ b/cave_data/1626-189.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>189</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-189</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 -->
@@ -56,7 +56,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-197.html b/cave_data/1626-197.html
index 31a000744..198ce4fdc 100644
--- a/cave_data/1626-197.html
+++ b/cave_data/1626-197.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>197</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-197</entranceslug>
@@ -41,7 +41,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-199.html b/cave_data/1626-199.html
index f41de3e0b..42d3269cd 100644
--- a/cave_data/1626-199.html
+++ b/cave_data/1626-199.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>199</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-199</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 -->
@@ -53,7 +53,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-2.html b/cave_data/1626-2.html
index 33df65780..3c53421a7 100644
--- a/cave_data/1626-2.html
+++ b/cave_data/1626-2.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>2</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-2</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 -->
diff --git a/cave_data/1626-200.html b/cave_data/1626-200.html
index 90e7c64fe..c285e0cda 100644
--- a/cave_data/1626-200.html
+++ b/cave_data/1626-200.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>200</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-200</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 -->
@@ -67,7 +67,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-202.html b/cave_data/1626-202.html
index 5d88bac25..a6f8f8288 100644
--- a/cave_data/1626-202.html
+++ b/cave_data/1626-202.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>202</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-202</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 -->
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-203.html b/cave_data/1626-203.html
index 3567e2ff0..f1a703988 100644
--- a/cave_data/1626-203.html
+++ b/cave_data/1626-203.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>203</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-203</entranceslug>
@@ -38,7 +38,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-205.html b/cave_data/1626-205.html
index c5f40b471..79b9614d3 100644
--- a/cave_data/1626-205.html
+++ b/cave_data/1626-205.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>205</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-205</entranceslug>
diff --git a/cave_data/1626-207.html b/cave_data/1626-207.html
index acfb95f97..70cf1a4ca 100644
--- a/cave_data/1626-207.html
+++ b/cave_data/1626-207.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>207</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-207</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 -->
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-257.html b/cave_data/1626-257.html
index dfe1ae442..941a05c4d 100644
--- a/cave_data/1626-257.html
+++ b/cave_data/1626-257.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>257</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-257</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 -->
@@ -55,7 +55,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-264.html b/cave_data/1626-264.html
index 0aaf666de..b75aeffda 100644
--- a/cave_data/1626-264.html
+++ b/cave_data/1626-264.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>264</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-264</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 -->
@@ -57,7 +57,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-27.html b/cave_data/1626-27.html
index fe9aba381..832d186fc 100644
--- a/cave_data/1626-27.html
+++ b/cave_data/1626-27.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>27</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-27</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 -->
@@ -62,7 +62,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-275.html b/cave_data/1626-275.html
index 18d849b08..565a102c0 100644
--- a/cave_data/1626-275.html
+++ b/cave_data/1626-275.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>275</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-275</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 -->
@@ -53,7 +53,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-29.html b/cave_data/1626-29.html
index 64ae3649a..4f438cd27 100644
--- a/cave_data/1626-29.html
+++ b/cave_data/1626-29.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>29</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-29</entranceslug>
@@ -39,7 +39,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-3.html b/cave_data/1626-3.html
index 6d6f004bf..8791bdca3 100644
--- a/cave_data/1626-3.html
+++ b/cave_data/1626-3.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>3</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-3</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 -->
diff --git a/cave_data/1626-33.html b/cave_data/1626-33.html
index 60390b409..9142652a4 100644
--- a/cave_data/1626-33.html
+++ b/cave_data/1626-33.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   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>not-CUCC-Expo</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'-->
+<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>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 -->
diff --git a/cave_data/1626-40.html b/cave_data/1626-40.html
index e5d45dce0..4aed81177 100644
--- a/cave_data/1626-40.html
+++ b/cave_data/1626-40.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>40</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-40</entranceslug>
@@ -43,7 +43,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-46.html b/cave_data/1626-46.html
index 7513bae1d..8ea4323c6 100644
--- a/cave_data/1626-46.html
+++ b/cave_data/1626-46.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>46</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-46</entranceslug>
diff --git a/cave_data/1626-49.html b/cave_data/1626-49.html
index 9b35cfcb4..8d2966765 100644
--- a/cave_data/1626-49.html
+++ b/cave_data/1626-49.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>49</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-49</entranceslug>
@@ -39,7 +39,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is (probably) an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-52.html b/cave_data/1626-52.html
index d42967727..1247d4414 100644
--- a/cave_data/1626-52.html
+++ b/cave_data/1626-52.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code>-</kataster_code>
 <kataster_number>52</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-52</entranceslug>
@@ -40,7 +40,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey></survey>
-<notes>This is an ARGE or VfHO cave where we only have the survex file and no other information</notes>
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file and no other information</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
diff --git a/cave_data/1626-63.html b/cave_data/1626-63.html
index ace8b5405..c49c7e455 100644
--- a/cave_data/1626-63.html
+++ b/cave_data/1626-63.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>63</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-63</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 -->
@@ -55,7 +55,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-7.html b/cave_data/1626-7.html
index 51d3804d8..72216fd83 100644
--- a/cave_data/1626-7.html
+++ b/cave_data/1626-7.html
@@ -22,7 +22,7 @@ the form documented at
 <area>1626</area>
 <kataster_code></kataster_code>
 <kataster_number>7</kataster_number> 
-<unofficial_number>not-CUCC-Expo</unofficial_number>
+<unofficial_number></unofficial_number>
 
 <entrance>
   <entranceslug>1626-7</entranceslug>
diff --git a/cave_data/1626-70.html b/cave_data/1626-70.html
index 2415c6fc3..adc3a9078 100644
--- a/cave_data/1626-70.html
+++ b/cave_data/1626-70.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>70</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-70</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 -->
@@ -53,7 +53,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-71.html b/cave_data/1626-71.html
index 4204881f3..c77faedc7 100644
--- a/cave_data/1626-71.html
+++ b/cave_data/1626-71.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>71</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-71a</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 -->
diff --git a/cave_data/1626-8.html b/cave_data/1626-8.html
index e6df83797..2c825539c 100644
--- a/cave_data/1626-8.html
+++ b/cave_data/1626-8.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>8</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-8</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 -->
@@ -66,7 +66,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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. -->
 <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>This is an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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 -->
 <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>
diff --git a/cave_data/1626-83.html b/cave_data/1626-83.html
index 07137e465..19f51d842 100644
--- a/cave_data/1626-83.html
+++ b/cave_data/1626-83.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>83</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-83</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 -->
@@ -54,7 +54,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-89.html b/cave_data/1626-89.html
index 103f4b02d..e766165ab 100644
--- a/cave_data/1626-89.html
+++ b/cave_data/1626-89.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>89</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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'-->
+<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>1626-89</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 -->
@@ -64,7 +64,7 @@ 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></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 (probably) an ARGE or VfHO cave where we only have the survex file 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 -->
+<notes>This is not a CUCC cave, maybe ARGE or VfHO where we only have the survex file 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)  -->
 <extent></extent>
diff --git a/cave_data/1626-9.html b/cave_data/1626-9.html
index abd873d7c..572563c01 100644
--- a/cave_data/1626-9.html
+++ b/cave_data/1626-9.html
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number>9</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>not-CUCC-Expo</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><!-- (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-9</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 -->