diff --git a/data/visibility.txt b/data/visibility.txt
index dd1d3eec98..28de335fa6 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -353,7 +353,7 @@ world  000000000000000000  +
             tunnel  000000000000001111  -
             {}
         planned  000000000000000000  -
-        primary  000000001111111111  +
+        primary  000000011111111111  +
             area  000000000000111111  -
             bridge  000000000000000011  -
             construction  000000000000111111  -
@@ -362,9 +362,9 @@ world  000000000000000000  +
             disused  000000000000000001  -
             junction  000000000000000011  -
             motorroad  000000000000111111  -
-            tunnel  000000001111111111  -
+            tunnel  000000011111111111  -
             {}
-        primary_link  000000001111111111  +
+        primary_link  000000011111111111  +
             area  000000000000111111  -
             bridge  000000000000000011  -
             construction  000000000000111111  -
@@ -373,10 +373,10 @@ world  000000000000000000  +
             disused  000000000000000001  -
             junction  000000000000000011  -
             motorroad  000000000000111111  -
-            tunnel  000000001111111111  -
+            tunnel  000000011111111111  -
             {}
         proposed  000000000000000000  -
-        raceway  000000011111111111  +
+        raceway  000000000111111111  +
             [use_status]  000000000000000000  -
             dismantled  000000000011111111  -
             disused  000000000011111111  -
@@ -588,17 +588,17 @@ world  000000000000000000  +
         {}
     landuse  000000000000000000  +
         allotments  000000000000111111  -
-        basin  000000011111111111  +
+        basin  000000000111111111  +
             detention  000000000000001111  -
             infiltration  000000000000001111  -
             retention  000000000000001111  -
             {}
         brownfield  000000000000111111  -
-        cemetery  000000111111111111  +
+        cemetery  000000000111111111  +
             [religion]  000000000000000000  -
             christian  000000000000001111  -
             {}
-        commercial  000000111111111111  -
+        commercial  000000000111111111  -
         conservation  000000000000111111  +
             [access]  000000000000000000  -
             destination  000000000000000111  -
@@ -627,14 +627,14 @@ world  000000000000000000  +
         military  000000000000111111  -
         orchard  000000000000000010  -
         quarry  000000000000111111  -
-        raceway  000000111111111111  +
+        raceway  000000000111111111  +
             [use_status]  000000000000000000  -
             dismantled  000000000011111111  -
             disused  000000000011111111  -
             {}
         railway  000000000000111111  -
         recreation_ground  000000000000111111  -
-        reservoir  000000111111111111  +
+        reservoir  000000000111111111  +
             [reservoir_type]  000000000000000000  -
             cooling  000000000000001111  -
             evaporator  000000000000001111  -
@@ -642,8 +642,8 @@ world  000000000000000000  +
             tailings  000000000000001111  -
             water_storage  000000000000001111  -
             {}
-        residential  000000111111111111  -
-        retail  000000111111111111  -
+        residential  000000000111111111  -
+        retail  000000000111111111  -
         runway  000000000011111111  +
             [use_status]  000000000000000000  -
             dismantled  000000000011111111  -
@@ -657,7 +657,7 @@ world  000000000000000000  +
             mixed  000000000000001111  -
             {}
         street  000000000000000010  -
-        village_green  000000111111111111  -
+        village_green  000000000111111111  -
         vineyard  000000000000011111  -
         wood  000000000011111111  +
             coniferous  000000000000001111  -
@@ -666,24 +666,24 @@ world  000000000000000000  +
             {}
         {}
     leisure  000000000000000000  +
-        common  000000111111111111  -
+        common  000000000111111111  -
         dog_park  000000000000111111  +
             [sport]  000000000000000000  -
             tennis  000000000000111111  -
             {}
-        garden  000000111111111111  -
+        garden  000000000111111111  -
         golf_course  000000000000001111  -
-        green  000000111111111111  -
+        green  000000000111111111  -
         landscape_reserve  000000000000001111  -
         nature_reserve  000000000000111111  -
-        park  000000111111111111  +
+        park  000000000111111111  +
             [access]  000000000000000000  -
             destination  000000000000000111  -
             no-access  000000000000000111  -
             permissive  000000000000000111  -
             private  000000000000000111  -
             {}
-        pitch  000000111111111111  +
+        pitch  000000000111111111  +
             [sport]  000000000000000000  -
             tennis  000000000000111111  -
             {}
@@ -691,7 +691,7 @@ world  000000000000000000  +
             [sport]  000000000000000000  -
             tennis  000000000000111111  -
             {}
-        playing_fields  000000111111111111  +
+        playing_fields  000000000111111111  +
             [sport]  000000000000000000  -
             tennis  000000000000111111  -
             {}
@@ -703,8 +703,8 @@ world  000000000000000000  +
             private  000000000000000111  -
             {}
         slipway  000000000000000001  -
-        sports_centre  000000111111111111  -
-        stadium  000000111111111111  -
+        sports_centre  000000000111111111  -
+        stadium  000000000111111111  -
         swimming_pool  000000000000011111  -
         track  000000000011111111  +
             area  000000000000111111  -
@@ -795,7 +795,7 @@ world  000000000000000000  +
         military  000000000000000100  -
         orchard  000000000000000100  -
         peak  000000000000111111  -
-        pond  000000111111111111  -
+        pond  000000000111111111  -
         quarry  000000000000000100  -
         railway  000000000000000100  -
         recreation_ground  000000000000000100  -
@@ -813,7 +813,7 @@ world  000000000000000000  +
         village_green  000000000000000100  -
         vineyard  000000000000000100  -
         volcano  000000000000111111  -
-        water  000000111111111111  -
+        water  000000011111111111  -
         wetland  000000000000001111  +
             bog  000000000000111111  -
             {}
@@ -938,7 +938,7 @@ world  000000000000000000  +
             bridge  000000000000000011  -
             tunnel  000000000000111111  -
             {}
-        rail  000000011111111111  +
+        rail  000000000111111111  +
             bridge  000000000000000011  -
             tunnel  000000000011111111  -
             {}