diff --git a/cave_data/1623-BS20-nn.html b/cave_data/1623-BS20.html
similarity index 72%
rename from cave_data/1623-BS20-nn.html
rename to cave_data/1623-BS20.html
index cecff0564..d6254c454 100644
--- a/cave_data/1623-BS20-nn.html
+++ b/cave_data/1623-BS20.html
@@ -8,15 +8,15 @@
 <body>
 <cave>
 <non_public>False</non_public>
-<caveslug>1623-BS20-nn?</caveslug>
+<caveslug>1623-BS20</caveslug>
 <official_name></official_name>
 <area>1623</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
-<unofficial_number>BS20-nn?</unofficial_number>
+<unofficial_number>BS20</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-BS20-nn?</entranceslug>
+  <entranceslug>1623-BS20</entranceslug>
   <letter></letter>
 </entrance>
 
@@ -27,13 +27,13 @@
 <survey></survey>
 <kataster_status></kataster_status>
 <underground_centre_line></underground_centre_line>
-<notes>UBSS finds - no documentation</notes>
+<notes>UBSS finds - no documentation. Was previously called BS20-nn? whcih caused django url resolution failures at it is not the expected cave slug name format.</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>1623/bs20-nn</url>
+<url>1623/bs20</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/BAD-URLS.txt b/cave_data/BAD-URLS.txt
index 6e7428712..28a1cc2d6 100644
--- a/cave_data/BAD-URLS.txt
+++ b/cave_data/BAD-URLS.txt
@@ -1,8 +1,6 @@
-1623-1989-01.html:<url>1989-01.html</url>
-1623-1990-15.html:<url>1990-15.html</url>
+; These are in both 1623 and 1626 but are not detected as such
 1623-232.html:<url>232.html</url>
 1623-233.html:<url>233.html</url>
 1623-252.html:<url>252.html</url>
-1623-BS1-15.html:<url>bs1-15.html</url>
-1623-BS18.html:<url>bs18.html</url>
-1623-BS20-nn.html:<url>bs20-nn.html</url>
+1623-255.html:<url>255.html</url>
+
diff --git a/cave_data/pendingcaves.txt b/cave_data/pendingcaves.txt
index 93c0d5207..f5199b0ea 100644
--- a/cave_data/pendingcaves.txt
+++ b/cave_data/pendingcaves.txt
@@ -3,7 +3,6 @@
 1626-casino
 1626-E02
 1626-E09
-1626-E08
 1626-E16
 1626-E28
 1626-upside-down
diff --git a/entrance_data/1623-BS20-nn.html b/entrance_data/1623-BS20.html
similarity index 98%
rename from entrance_data/1623-BS20-nn.html
rename to entrance_data/1623-BS20.html
index b9b42bd2e..127fd2efb 100644
--- a/entrance_data/1623-BS20-nn.html
+++ b/entrance_data/1623-BS20.html
@@ -8,7 +8,7 @@
 <body>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-BS20-nn?</slug>
+<slug>1623-BS20</slug>
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
