diff --git a/data/deprecated.json b/data/deprecated.json
index 6a19a43e..a70e3fff 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1,5 +1,6 @@
 [
   {
+    "status": "wiki-deprecated",
     "old": {"aerialway": "canopy"},
     "replace": {"aerialway": "zip_line"}
   },
@@ -8,30 +9,26 @@
     "replace": {"aeroway": "jet_bridge", "highway": "corridor"}
   },
   {
+    "status": "typo",
     "old": {"access": "customer"},
     "replace": {"access": "customers"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"access": "public"},
     "replace": {"access": "yes"}
   },
-  {
-    "old": {"aerodrome": "military"},
-    "replace": {"military": "airfield"}
-  },
   {
     "old": {"aerodrome:type": "military"},
     "replace": {"military": "airfield"}
   },
   {
-    "old": {"agrarian": "agrcultural_machinry"},
-    "replace": {"agrarian": "agricultural_machinery"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"amenity": "advertising"},
     "replace": {"advertising": "*"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "artwork"},
     "replace": {"tourism": "artwork"}
   },
@@ -40,42 +37,47 @@
     "replace": {"office": "bail_bond_agent"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "car_repair"},
     "replace": {"shop": "car_repair"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "changing_room"},
     "replace": {"amenity": "dressing_room"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "citymap_post"},
     "replace": {"tourism": "information"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "club"},
     "replace": {"club": "*"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "community_center"},
     "replace": {"amenity": "community_centre"}
   },
   {
-    "old": {"amenity": "dancing_school"},
-    "replace": {"leisure": "dance", "dance:teaching": "yes" }
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"amenity": "dog_bin"},
     "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "dog_waste_bin"},
     "replace": {"amenity": "waste_basket", "waste": "dog_excrement"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "embassy"},
     "replace": {"office": "diplomatic"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "ev_charging"},
     "replace": {"amenity": "charging_station"}
   },
@@ -84,38 +86,36 @@
      "replace": {"amenity": "charging_station", "motorcar": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "fire_hydrant"},
     "replace": {"emergency": "fire_hydrant"}
   },
-  {
-    "old": {"amenity": "firepit"},
-    "replace": {"leisure": "firepit"}
-  },
   {
     "old": {"amenity": "garage"},
     "replace": {"landuse": "garages"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "garages"},
     "replace": {"landuse": "garages"}
   },
   {
-    "old": {"amenity": "givebox"},
-    "replace": {"amenity": "give_box"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"amenity": "gym"},
     "replace": {"leisure": "fitness_centre"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "hotel"},
     "replace": {"tourism": "hotel"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "kiosk"},
     "replace": {"shop": "kiosk"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "lifeboat_station"},
     "replace": {"emergency": "water_rescue"}
   },
@@ -124,22 +124,22 @@
     "replace": {"advertising": "board"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "nursery"},
     "replace": {"amenity": "kindergarten"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "preschool"},
     "replace": {"amenity": "kindergarten", "preschool": "yes"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "public_building"},
     "replace": {"building": "public"}
   },
   {
-    "old": {"amenity": "real_estate"},
-    "replace": {"office": "estate_agent"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"amenity": "register_office"},
     "replace": {"office": "government", "government": "register_office"}
   },
@@ -148,6 +148,7 @@
     "replace": {"amenity": "research_institute"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "sauna"},
     "replace": {"leisure": "sauna"}
   },
@@ -156,46 +157,54 @@
     "replace": {"landuse": "industrial", "industrial": "scrap_yard"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "shop"},
     "replace": {"shop": "*"}
   },
   {
-    "old": {"amenity": "sloped_curb"},
-    "replace": {"kerb": "lowered"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"amenity": "swimming_pool"},
     "replace": {"leisure": "swimming_pool"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "ticket_booth"},
     "replace": {"shop": "ticket"}
   },
   {
+    "status": "typo",
     "old": {"amenity": "toilet"},
     "replace": {"amenity": "toilets"}
   },
   {
-    "old": {"amenity": "vending_machine", "vending": "news_papers"},
-    "replace": {"amenity": "vending_machine", "vending": "newspapers"}
-  },
-  {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "vending",
+      "value": "parcel_pickup"
+    },
     "old": {"amenity": "vending_machine", "vending": "parcel_pickup"},
     "replace": {"amenity": "parcel_locker"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "vending",
+      "value": "parcel_pickup"
+    },
     "old": {"amenity": "vending_machine", "vending": "parcel_mail_in;parcel_pickup"},
     "replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "vending",
+      "value": "parcel_pickup"
+    },
     "old": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"},
     "replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
   },
   {
-    "old": {"amenity": "weigh_bridge"},
-    "replace": {"amenity": "weighbridge"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"amenity": "winery"},
     "replace": {"craft": "winery"}
   },
@@ -204,6 +213,7 @@
     "replace": {"amenity": "community_centre", "community_centre": "youth_centre"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"amenity": "youth_centre"},
     "replace": {"amenity": "community_centre", "community_centre": "youth_centre"}
   },
@@ -211,10 +221,6 @@
     "old": {"artwork": "*"},
     "replace": {"artwork_type": "$1"}
   },
-  {
-    "old": {"artwork:type": "*"},
-    "replace": {"artwork_type": "$1"}
-  },
   {
     "old": {"attraction": "ferris_wheel"},
     "replace": {"attraction": "big_wheel"}
@@ -224,10 +230,12 @@
     "replace": {"barrier": "cycle_barrier"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"barrier": "curb"},
     "replace": {"barrier": "kerb"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"barrier": "embankment"},
     "replace": {"man_made": "embankment"}
   },
@@ -240,17 +248,15 @@
     "replace": {"barrier": "wall", "wall": "noise_barrier"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"barrier": "wire_fence"},
     "replace": {"barrier": "fence", "fence_type": "wire"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"barrier": "wood_fence"},
     "replace": {"barrier": "fence", "fence_type": "wood"}
   },
-  {
-    "old": {"amenity": "bench", "capacity": "*"},
-    "replace": {"amenity": "bench", "seats": "$1"}
-  },
   {
     "old": {"bicycle:oneway": "*"},
     "replace": {"oneway:bicycle": "$1"}
@@ -276,6 +282,7 @@
     "replace": {"building": "yes"}
   },
   {
+    "status": "typo",
     "old": {"building": "comercial"},
     "replace": {"building": "commercial"}
   },
@@ -288,13 +295,10 @@
     "replace": {"building": "detached"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"building": "entrance"},
     "replace": {"entrance": "*"}
   },
-  {
-    "old": {"building": "family_house"},
-    "replace": {"building": "house"}
-  },
   {
     "old": {"building": "home"},
     "replace": {"building": "house"}
@@ -304,14 +308,12 @@
     "replace": {"building": "house"}
   },
   {
-    "old": {"building": "household"},
-    "replace": {"building": "house"}
-  },
-  {
+    "status": "typo",
     "old": {"building": "offices"},
     "replace": {"building": "office"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"building": "other"},
     "replace": {"building": "yes"}
   },
@@ -328,6 +330,7 @@
     "replace": {"building:part": "yes"}
   },
   {
+    "status": "typo",
     "old": {"building": "pavillion"},
     "replace": {"building": "pavilion"}
   },
@@ -336,10 +339,12 @@
     "replace": {"building": "train_station"}
   },
   {
+    "status": "typo",
     "old": {"building": "Residential"},
     "replace": {"building": "residential"}
   },
   {
+    "status": "typo",
     "old": {"building": "services"},
     "replace": {"building": "service"}
   },
@@ -355,31 +360,32 @@
     "old": {"building": "Si"},
     "replace": {"building": "yes"}
   },
-  {
-    "old": {"building": "Sí"},
-    "replace": {"building": "yes"}
-  },
   {
     "old": {"building": "under construction"},
     "replace": {"building": "construction"}
   },
   {
+    "status": "typo",
     "old": {"building": "y"},
     "replace": {"building": "yes"}
   },
   {
+    "status": "typo",
     "old": {"building:color": "*"},
     "replace": {"building:colour": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"building:height": "*"},
     "replace": {"height": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"building:level": "*"},
     "replace": {"building:levels": "$1"}
   },
   {
+    "status": "typo",
     "old": {"building:material": "Brick"},
     "replace": {"building:material": "brick"}
   },
@@ -388,6 +394,7 @@
     "replace": {"min_height": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"building:roof:colour": "*"},
     "replace": {"roof:colour": "$1"}
   },
@@ -396,14 +403,17 @@
     "replace": {"roof:shape": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"building:type": "*"},
     "replace": {"building": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"camp_site": "camp_pitch"},
     "replace": {"tourism": "camp_pitch"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"color": "*"},
     "replace": {"colour": "$1"}
   },
@@ -415,10 +425,12 @@
     "old": {"content": "unknown"}
   },
   {
+    "status": "typo",
     "old": {"contents": "*"},
     "replace": {"content": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"craft": "car_repair"},
     "replace": {"shop": "car_repair"}
   },
@@ -435,8 +447,12 @@
     "replace": {"craft": "sculptor"}
   },
   {
-    "old": {"crossing": "island"},
-    "replace": {"crossing:island": "yes"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "crossing"
+    },
+    "old": {"crossing": "island", "highway": "crossing"},
+    "replace": {"crossing:island": "yes", "highway": "crossing"}
   },
   {
     "old": {"crossing": "traffic_lights"},
@@ -447,25 +463,15 @@
     "replace": {"crossing": "no"}
   },
   {
+    "status": "typo",
     "old": {"cuisine": "barbeque"},
     "replace": {"cuisine": "barbecue"}
   },
   {
+    "status": "typo",
     "old": {"cuisine": "bbq"},
     "replace": {"cuisine": "barbecue"}
   },
-  {
-    "old": {"cuisine": "gluten-free"},
-    "replace": {"diet:gluten_free": "*"}
-  },
-  {
-    "old": {"cuisine": "halal"},
-    "replace": {"diet:halal": "*"}
-  },
-  {
-    "old": {"cuisine": "kosher"},
-    "replace": {"diet:kosher": "*"}
-  },
   {
     "old": {"cuisine": "vegan"},
     "replace": {"diet:vegan": "*"}
@@ -474,10 +480,6 @@
     "old": {"cuisine": "vegetarian"},
     "replace": {"diet:vegetarian": "*"}
   },
-  {
-    "old": {"culvert": "culvert"},
-    "replace": {"tunnel": "culvert"}
-  },
   {
     "old": {"culvert": "tunnel"},
     "replace": {"tunnel": "culvert"}
@@ -491,18 +493,34 @@
     "replace": {"kerb": "$1"}
   },
   {
-    "old": {"diaper": "1"},
-    "replace": {"changing_table": "yes", "changing_table:count": "1"}
+    "old": {"cycleway": "none"},
+    "replace": {"cycleway": "no"}
   },
   {
+    "old": {"cycleway:left": "none"},
+    "replace": {"cycleway:left": "no"}
+  },
+  {
+    "old": {"cycleway:right": "none"},
+    "replace": {"cycleway:right": "no"}
+  },
+  {
+    "old": {"cycleway:both": "none"},
+    "replace": {"cycleway:both": "no"}
+  },
+  {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "diaper"
+    },
     "old": {"diaper": "no"},
     "replace": {"changing_table": "no"}
   },
   {
-    "old": {"diaper": "room"},
-    "replace": {"changing_table": "yes", "changing_table:location": "room"}
-  },
-  {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "diaper"
+    },
     "old": {"diaper": "yes"},
     "replace": {"changing_table": "yes"}
   },
@@ -551,6 +569,11 @@
     "replace": {"capacity:disabled": "$1"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "amenity",
+      "value": "loading_dock"
+    },
     "old": {"door": "loadingdock"},
     "replace": {"amenity": "loading_dock"}
   },
@@ -558,10 +581,6 @@
     "old": {"drinkable": "*"},
     "replace": {"drinking_water": "$1"}
   },
-  {
-    "old": {"embankment": "1"},
-    "replace": {"embankment": "yes"}
-  },
   {
     "old": {"embankment": "false"},
     "replace": {"embankment": "no"}
@@ -575,70 +594,61 @@
     "replace": {"embankment": "yes"}
   },
   {
-    "old": {"embassy": "embassy"},
-    "replace": {"embassy": "yes"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"emergency": "dry_riser_inlet"},
     "replace": {"emergency": "fire_service_inlet", "fire_mains": "dry"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "sprinkler_connection"},
     "replace": {"emergency": "fire_service_inlet", "fire_sprinkler": "yes"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "lifeguard_base"},
     "replace": {"emergency": "lifeguard", "lifeguard": "base"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "lifeguard_platform"},
     "replace": {"emergency": "lifeguard", "lifeguard": "tower"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "lifeguard_tower"},
     "replace": {"emergency": "lifeguard", "lifeguard": "tower"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "water_rescue_station"},
     "replace": {"emergency": "water_rescue"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "lifeboat_station"},
     "replace": {"emergency": "water_rescue"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "ses_station"},
     "replace": {"emergency": "disaster_response"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"emergency": "marine_rescue"},
     "replace": {"emergency": "water_rescue"}
   },
-  {
-    "old": {"emergency_service": "air"},
-    "replace": {"emergency": "air_rescue_service"}
-  },
-  {
-    "old": {"entrance": "emergency_exit"},
-    "replace": {"entrance": "emergency"}
-  },
-  {
-    "old": {"entrance": "fire_exit"},
-    "replace": {"entrance": "emergency"}
-  },
   {
     "old": {"entrance": "loading_dock"},
     "replace": {"amenity": "loading_dock"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"entrance": "main_entrance"},
     "replace": {"entrance": "main"}
   },
   {
-    "old": {"entrance": "private"},
-    "replace": {"entrance": "yes", "access": "private"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"escalator": "*"},
     "replace": {"highway": "steps", "conveying": "$1"}
   },
@@ -663,6 +673,7 @@
     "replace": {"fee": "no"}
   },
   {
+    "status": "typo",
     "old": {"fee": "No"},
     "replace": {"fee": "no"}
   },
@@ -675,14 +686,17 @@
     "replace": {"fee": "yes"}
   },
   {
+    "status": "typo",
     "old": {"fee": "Yes"},
     "replace": {"fee": "yes"}
   },
   {
+    "status": "typo",
     "old": {"FIXME": "*"},
     "replace": {"fixme": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"footway": "both"},
     "replace": {"sidewalk": "both"}
   },
@@ -691,6 +705,7 @@
     "replace": {"cycleway": "crossing", "highway": "cycleway"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"footway": "left"},
     "replace": {"sidewalk": "left"}
   },
@@ -703,6 +718,7 @@
     "replace": {"sidewalk": "no"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"footway": "right"},
     "replace": {"sidewalk": "right"}
   },
@@ -719,6 +735,7 @@
     "replace": {"leisure": "adult_gaming_centre", "gambling": "$1"}
   },
   {
+    "status": "typo",
     "old": {"gambling": "slot_machine"},
     "replace": {"gambling": "slot_machines"}
   },
@@ -730,10 +747,6 @@
     "old": {"generator:method": "solar"},
     "replace": {"generator:source": "solar"}
   },
-  {
-    "old": {"golf": "faiway"},
-    "replace": {"golf": "fairway"}
-  },
   {
     "old": {"golf": "putting_green"},
     "replace": {"golf": "green"}
@@ -751,10 +764,7 @@
     "replace": {"golf": "tee"}
   },
   {
-    "old": {"golf": "teebox"},
-    "replace": {"golf": "tee"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"healthcare": "birthing_center"},
     "replace": {"healthcare": "birthing_centre"}
   },
@@ -763,10 +773,16 @@
     "replace": {"healthcare:speciality": "internal"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"highway": "abandoned"},
     "replace": {"abandoned:highway": "*"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "service",
+      "value": "busway"
+    },
     "old": {"highway": "service", "service": "busway"},
     "replace": {"highway": "busway"}
   },
@@ -783,6 +799,7 @@
     "replace": {"highway": "path", "foot": "no"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"highway": "ford"},
     "replace": {"ford": "*"}
   },
@@ -791,26 +808,36 @@
     "replace": {"highway": "platform", "public_transport": "platform"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"highway": "stile"},
     "replace": {"barrier": "stile"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"highway": "unsurfaced"},
     "replace": {"highway": "road", "surface": "unpaved"}
   },
   {
+    "status": "wiki-deprecated",
      "old": {"historic": "archaeological_site", "site_type": "*"},
      "replace": {"historic": "archaeological_site", "archaeological_site": "$1"}
   },
   {
+    "old": {"industrial": "brickworks"},
+    "replace": {"industrial": "brickyard"}
+  },
+  {
+    "status": "wiki-deprecated",
     "old": {"industrial": "gas"},
     "replace": {"utility": "gas"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"information": "citymap"},
     "replace": {"tourism": "information", "information": "map", "map_type": "street", "map_size": "city"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"information": "hikingmap"},
     "replace": {"tourism": "information", "information": "map", "map_type": "topo", "hiking": "yes"}
   },
@@ -871,10 +898,18 @@
     "replace": {"internet_access:fee": "no"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "internet_access"
+    },
     "old": {"internet_access:name": "*"},
     "replace": {"internet_access:ssid": "$1"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "internet_access"
+    },
     "old": {"internet_access:type": "*"},
     "replace": {"internet_access": "$1"}
   },
@@ -887,41 +922,14 @@
     "replace": {"kerb": "flush"}
   },
   {
+    "status": "typo",
     "old": {"lamp_mount": "bent mast"},
     "replace": {"lamp_mount": "bent_mast"}
   },
-  {
-    "old": {"lamp_mount": "straight mast"},
-    "replace": {"lamp_mount": "straight_mast"}
-  },
-  {
-    "old": {"lamp_mount": "straightmast"},
-    "replace": {"lamp_mount": "straight_mast"}
-  },
-  {
-    "old": {"lamp_mount": "streight_mast"},
-    "replace": {"lamp_mount": "straight_mast"}
-  },
-  {
-    "old": {"lamp_mount": "wal"},
-    "replace": {"lamp_mount": "wall"}
-  },
   {
     "old": {"lamp_mount": "wall mounted"},
     "replace": {"lamp_mount": "wall"}
   },
-  {
-    "old": {"lamp_mount": "wall_mount"},
-    "replace": {"lamp_mount": "wall"}
-  },
-  {
-    "old": {"lamp_mount": "wall_mounted"},
-    "replace": {"lamp_mount": "wall"}
-  },
-  {
-    "old": {"landcover": "flower_bed"},
-    "replace": {"landuse": "flowerbed"}
-  },
   {
     "old": {"landcover": "flowerbed"},
     "replace": {"landuse": "flowerbed"}
@@ -930,15 +938,12 @@
     "old": {"landuse": "basin"},
     "replace": {"natural": "water", "water": "basin"}
   },
-  {
-    "old": {"landuse": "churchyard"},
-    "replace": {"landuse": "religious"}
-  },
   {
     "old": {"landuse": "conservation"},
     "replace": {"boundary": "protected_area"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"landuse": "field"},
     "replace": {"landuse": "farmland"}
   },
@@ -947,6 +952,7 @@
     "replace": {"leisure": "garden"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"landuse": "pond"},
     "replace": {"natural": "water", "water": "pond"}
   },
@@ -955,6 +961,7 @@
     "replace": {"landuse": "industrial", "industrial": "port"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"landuse": "reservoir"},
     "replace": {"natural": "water", "water": "reservoir"}
   },
@@ -967,18 +974,17 @@
      "replace": {"man_made": "tailings_pond"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"landuse": "school"},
     "replace": {"landuse": "education"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"landuse": "wood"},
     "replace": {"natural": "wood"}
   },
   {
-    "old": {"lawyer": "notary"},
-    "replace": {"office": "notary"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"leisure": "beach"},
     "replace": {"natural": "beach"}
   },
@@ -987,58 +993,72 @@
     "replace": {"amenity": "gambling", "gambling": "bingo"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"leisure": "club"},
     "replace": {"club": "*"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"leisure": "gambling"},
     "replace": {"amenity": "gambling"}
   },
   {
-    "old": {"leisure": "golf_pin"},
-    "replace": {"golf": "pin"}
-  },
-  {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sport",
+      "value": "hockey"
+    },
     "old": {"leisure": "ice_rink", "sport": "hockey"},
     "replace": {"leisure": "ice_rink", "sport": "ice_hockey"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sport",
+      "value": "skating"
+    },
     "old": {"leisure": "ice_rink", "sport": "skating"},
     "replace": {"leisure": "ice_rink", "sport": "ice_skating"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"leisure": "maze"},
     "replace": {"attraction": "maze"}
   },
-  {
-    "old": {"leisure": "recreation_ground"},
-    "replace": {"landuse": "recreation_ground"}
-  },
   {
     "old": {"leisure": "swimming_pool", "swimming_pool": "hot_tub"},
     "replace": {"leisure": "hot_tub"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"leisure": "table_tennis_table"},
     "replace": {"leisure": "pitch", "sport": "table_tennis"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"leisure": "video_arcade"},
     "replace": {"leisure": "amusement_arcade"}
   },
   {
+    "status": "typo",
     "old": {"Level": "*"},
     "replace": {"level": "$1"}
   },
   {
+    "status": "typo",
     "old": {"LEVEL": "*"},
     "replace": {"level": "$1"}
   },
   {
-    "old": {"levels": "*"},
-    "replace": {"building:levels": "$1"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "levels"
+    },
+    "old": {"levels": "*", "building": "*"},
+    "replace": {"building:levels": "$1", "building": "$2"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"man_made": "cut_line"},
     "replace": {"man_made": "cutline"}
   },
@@ -1059,14 +1079,12 @@
     "replace": {"man_made": "petroleum_well", "substance": "gas"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"man_made": "jetty"},
     "replace": {"man_made": "pier"}
   },
   {
-    "old": {"man_made": "mdf"},
-    "replace": {"telecom": "exchange"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"man_made": "MDF"},
     "replace": {"telecom": "exchange"}
   },
@@ -1075,10 +1093,12 @@
     "replace": {"man_made": "storage_tank", "content": "oil"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"man_made": "oil_well"},
     "replace": {"man_made": "petroleum_well", "substance": "oil"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"man_made": "telephone_exchange"},
     "replace": {"telecom": "exchange"}
   },
@@ -1091,33 +1111,14 @@
     "replace": {"man_made": "storage_tank", "content": "wastewater"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"man_made": "water_tank"},
     "replace": {"man_made": "storage_tank", "content": "water"}
   },
-  {
-    "old": {"man_made": "weigh_bridge"},
-    "replace": {"amenity": "weighbridge"}
-  },
-  {
-    "old": {"man_made": "weighbridge"},
-    "replace": {"amenity": "weighbridge"}
-  },
-  {
-    "old": {"man_made": "weighing_machine"},
-    "replace": {"amenity": "weighbridge"}
-  },
   {
     "old": {"man_made": "weighing_scale"},
     "replace": {"amenity": "weighbridge"}
   },
-  {
-    "old": {"man_made": "weighting machine"},
-    "replace": {"amenity": "weighbridge"}
-  },
-  {
-    "old": {"man_made": "weighting_machine"},
-    "replace": {"amenity": "weighbridge"}
-  },
   {
     "old": {"man_made": "well"},
     "replace": {"man_made": "water_well"}
@@ -1127,6 +1128,7 @@
     "replace": {"craft": "winery"}
   },
   {
+    "status": "typo",
     "old": {"maxage": "*"},
     "replace": {"max_age": "$1"}
   },
@@ -1134,11 +1136,21 @@
     "old": {"memorial": "plate"},
     "replace": {"memorial": "plaque"}
   },
+  {
+    "status": "wiki-deprecated",
+    "old": {"memorial:type": "stolperstein"},
+    "replace": {"memorial": "stolperstein"}
+  },
+  {
+    "old": {"memorial:text": "*"},
+    "replace": {"inscription": "$1"}
+  },
   {
     "old": {"men": "*"},
     "replace": {"male": "$1"}
   },
   {
+    "status": "typo",
     "old": {"minage": "*"},
     "replace": {"min_age": "$1"}
   },
@@ -1146,10 +1158,6 @@
     "old": {"mining_resource": "*"},
     "replace": {"resource": "$1"}
   },
-  {
-    "old": {"museum_type": "history"},
-    "replace": {"museum": "history"}
-  },
   {
     "old": {"museum_type": "private"},
     "replace": {"operator:type": "private"}
@@ -1159,6 +1167,7 @@
     "replace": {"operator:type": "public"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"natural": "marsh"},
     "replace": {"natural": "wetland", "wetland": "marsh"}
   },
@@ -1171,22 +1180,21 @@
     "replace": {"waterway": "waterfall"}
   },
   {
+    "status": "typo",
     "old": {"NOTE": "*"},
     "replace": {"note": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"office": "administrative"},
     "replace": {"office": "government"}
   },
-  {
-    "old": {"office": "consultancy"},
-    "replace": {"office": "consulting"}
-  },
   {
     "old": {"office": "consultant"},
     "replace": {"office": "consulting"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"office": "real_estate"},
     "replace": {"office": "estate_agent"}
   },
@@ -1195,93 +1203,109 @@
     "replace": {"oneway": "yes"}
   },
   {
-    "old": {"oneway": "alternate"},
-    "replace": {"oneway": "alternating"}
-  },
-  {
+    "status": "typo",
     "old": {"operator:type": "goverment"},
     "replace": {"operator:type": "government"}
   },
   {
-    "old": {"operator:type": "Privado"},
+    "status": "typo",
+    "old": {"operator:type": "privado"},
     "replace": {"operator:type": "private"}
   },
   {
+    "status": "typo",
     "old": {"operator:type": "Private"},
     "replace": {"operator:type": "private"}
   },
   {
+    "status": "typo",
     "old": {"operator:type": "Public"},
     "replace": {"operator:type": "public"}
   },
   {
-    "old": {"operator:type": "Publico"},
+    "status": "typo",
+    "old": {"operator:type": "publico"},
     "replace": {"operator:type": "public"}
   },
   {
     "old": {"operator:type": "unknown"}
   },
   {
-    "old": {"parking": "covered"},
-    "replace": {"covered": "yes"}
+    "old": {"amenity": "parking", "parking": "covered"},
+    "replace": {"amenity": "parking", "covered": "yes"}
   },
   {
-    "old": {"parking": "customers"},
-    "replace": {"access": "customers"}
+    "old": {"amenity": "parking", "parking": "customers"},
+    "replace": {"amenity": "parking", "access": "customers"}
   },
   {
     "old": {"parking": "entrance"},
     "replace": {"amenity": "parking_entrance"}
   },
   {
-    "old": {"parking": "park_and_ride"},
-    "replace": {"park_ride": "yes"}
+    "old": {"amenity": "parking", "parking": "park_and_ride"},
+    "replace": {"amenity": "parking", "park_ride": "yes"}
   },
   {
-    "old": {"parking": "private"},
-    "replace": {"access": "private"}
+    "old": {"amenity": "parking", "parking": "private"},
+    "replace": {"amenity": "parking", "access": "private"}
   },
   {
-    "old": {"parking": "street"},
-    "replace": {"parking": "lane"}
+    "old": {"amenity": "parking", "parking": "street"},
+    "replace": {"amenity": "parking", "parking": "lane"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"parking:orientation": "*"},
     "replace": {"orientation": "$1"}
   },
   {
-    "old": {"orientation": "orthogonal"},
-    "replace": {"orientation": "perpendicular"}
-  },
-  {
-    "old": {"parking:orientation": "orthogonal"},
-    "replace": {"parking:orientation": "perpendicular"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"place_name": "*"},
     "replace": {"name": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"pole": "transition"},
     "replace": {"location:transition": "yes"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"pole:type": "branch", "branch:type": "cross"},
     "replace": {"line_management": "cross"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"pole:type": "branch", "branch:type": "loop"},
     "replace": {"line_management": "split"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"pole:type": "branch", "branch:type": "split"},
     "replace": {"line_management": "split"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"pole:type": "branch", "branch:type": "tap"},
     "replace": {"line_management": "branch"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "pole:type"
+    },
     "old": {"pole:type": "termination"},
     "replace": {"line_management": "termination"}
   },
@@ -1290,34 +1314,41 @@
     "replace": {"addr:postcode": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"power": "busbar"},
     "replace": {"power": "line", "line": "busbar"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "power",
+      "value": "line"
+    },
     "old": {"power": "line", "location": "underground"},
     "replace": {"power": "cable", "location": "underground"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"power": "marker"},
     "replace": {"marker": "*", "utility": "power"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"power": "sub_station"},
     "replace": {"power": "substation"}
   },
   {
-    "old": {"power": "substation", "location": "kiosk"},
-    "replace": {"power": "substation", "man_made": "street_cabinet", "street_cabinet": "power"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"power": "underground_cable"},
     "replace": {"power": "cable", "location": "underground"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"power_source": "*"},
     "replace": {"generator:source": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"power_rating": "*"},
     "replace": {"generator:output": "$1"}
   },
@@ -1342,12 +1373,17 @@
     "replace": {"pump": "powered"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "abandoned",
+      "value": "yes"
+    },
     "old": {"railway": "*", "abandoned": "yes"},
-    "replace": {"abandoned:railway": "$1"}
+    "replace": {"railway": "abandoned", "abandoned:railway": "$1"}
   },
   {
     "old": {"railway": "*", "disused": "yes"},
-    "replace": {"disused:railway": "$1"}
+    "replace": {"railway": "disused", "disused:railway": "$1"}
   },
   {
     "old": {"railway": "platform"},
@@ -1374,38 +1410,37 @@
     "replace": {"maxspeed:advisory:forward": "$1"}
   },
   {
-    "old": {"religion": "catholic"},
-    "replace": {"religion": "christian", "denomination": "catholic"}
-  },
-  {
+    "status": "typo",
     "old": {"roof:color": "*"},
     "replace": {"roof:colour": "$1"}
   },
   {
+    "status": "typo",
     "old": {"roof:shape": "half_hipped"},
     "replace": {"roof:shape": "half-hipped"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"route": "ncn"},
     "replace": {"route": "bicycle", "network": "ncn"}
   },
   {
+    "status": "typo",
     "old": {"service": "drive_through"},
     "replace": {"service": "drive-through"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "adult"},
     "replace": {"shop": "erotic"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "antique"},
     "replace": {"shop": "antiques"}
   },
   {
-    "old": {"shop": "army_surplus"},
-    "replace": {"shop": "military_surplus"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"shop": "auto_parts"},
     "replace": {"shop": "car_parts"}
   },
@@ -1414,30 +1449,22 @@
     "replace": {"shop": "baby_goods"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "baby_care"},
     "replace": {"shop": "baby_goods"}
   },
   {
-    "old": {"shop": "bags"},
-    "replace": {"shop": "bag"}
-  },
-  {
-    "old": {"shop": "bail_bond"},
-    "replace": {"office": "bail_bond_agent"}
-  },
-  {
-    "old": {"shop": "bail_bonds"},
-    "replace": {"office": "bail_bond_agent"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"shop": "betting"},
     "replace": {"shop": "bookmaker"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "boutique"},
     "replace": {"shop": "clothes"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "cafe"},
     "replace": {"amenity": "cafe"}
   },
@@ -1446,10 +1473,7 @@
     "replace": {"shop": "clothes", "second_hand": "yes"}
   },
   {
-    "old": {"shop": "consulting"},
-    "replace": {"office": "consulting"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"shop": "dive"},
     "replace": {"shop": "scuba_diving"}
   },
@@ -1458,18 +1482,22 @@
     "replace": {"shop": "clothes"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "fish"},
     "replace": {"shop": "seafood"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "fishmonger"},
     "replace": {"shop": "seafood"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "furnace"},
     "replace": {"shop": "fireplace"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "gallery"},
     "replace": {"shop": "art"}
   },
@@ -1482,13 +1510,10 @@
     "replace": {"office": "insurance"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "jewellery"},
     "replace": {"shop": "jewelry"}
   },
-  {
-    "old": {"shop": "lingerie"},
-    "replace": {"shop": "clothes", "clothes": "underwear"}
-  },
   {
     "old": {"shop": "luggage"},
     "replace": {"shop": "bag"}
@@ -1502,18 +1527,22 @@
     "replace": {"amenity": "money_transfer"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "moneylender"},
     "replace": {"shop": "money_lender"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "office_supplies"},
     "replace": {"shop": "stationery"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "organic"},
     "replace": {"shop": "yes", "organic": "only"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "perfume"},
     "replace": {"shop": "perfumery"}
   },
@@ -1522,18 +1551,12 @@
     "replace": {"craft": "photographer"}
   },
   {
-    "old": {"shop": "real_estate"},
-    "replace": {"office": "estate_agent"}
-  },
-  {
-    "old": {"shop": "telecommunications"},
-    "replace": {"shop": "telecommunication"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"shop": "tickets"},
     "replace": {"shop": "ticket"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"shop": "underwear"},
     "replace": {"shop": "clothes", "clothes": "underwear"}
   },
@@ -1542,26 +1565,50 @@
     "replace": {"craft": "winery"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "0"},
     "replace": {"kerb": "flush"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "0.00"},
     "replace": {"kerb": "flush"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "0.01"},
     "replace": {"kerb": "lowered", "kerb:height": "1 cm"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "0.02"},
     "replace": {"kerb": "lowered", "kerb:height": "2 cm"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "0.03"},
     "replace": {"kerb": "lowered", "kerb:height": "3 cm"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "at_grade"},
     "replace": {"kerb": "flush"}
   },
@@ -1570,14 +1617,26 @@
     "replace": {"kerb": "lowered"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "flush"},
     "replace": {"kerb": "flush"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "low"},
     "replace": {"kerb": "lowered"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "sloped_curb"
+    },
     "old": {"sloped_curb": "no"},
     "replace": {"kerb": "raised"}
   },
@@ -1586,18 +1645,22 @@
     "replace": {"kerb": "lowered"}
   },
   {
+    "status": "typo",
     "old": {"sport": "horse_shoes"},
     "replace": {"sport": "horseshoes"}
   },
   {
+    "status": "typo",
     "old": {"sport": "horseshoe"},
     "replace": {"sport": "horseshoes"}
   },
   {
+    "status": "typo",
     "old": {"sport": "shuffle_board"},
     "replace": {"sport": "shuffleboard"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"sport": "team_handball"},
     "replace": {"sport": "handball"}
   },
@@ -1618,6 +1681,11 @@
     "replace": {"station": "train", "train": "yes"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "stream",
+      "value": "intermittent"
+    },
     "old": {"stream": "intermittent", "waterway": "stream"},
     "replace": {"intermittent": "yes", "waterway": "stream"}
   },
@@ -1626,6 +1694,11 @@
     "replace": {"utility": "telecom"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "man_made",
+      "value": "street_cabinet"
+    },
     "old": {"street_cabinet": "cable_tv"},
     "replace": {"utility": "television"}
   },
@@ -1634,42 +1707,52 @@
     "replace": {"utility": "telecom"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "man_made",
+      "value": "street_cabinet"
+    },
     "old": {"street_cabinet": "gas"},
     "replace": {"utility": "gas"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "man_made",
+      "value": "street_cabinet"
+    },
     "old": {"street_cabinet": "power"},
     "replace": {"utility": "power"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "man_made",
+      "value": "street_cabinet"
+    },
     "old": {"street_cabinet": "street_lighting"},
     "replace": {"utility": "street_lighting"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "man_made",
+      "value": "street_cabinet"
+    },
     "old": {"street_cabinet": "telecom"},
     "replace": {"utility": "telecom"}
   },
   {
+    "status": "typo",
     "old": {"survey_date": "*"},
     "replace": {"survey:date": "$1"}
   },
-  {
-    "old": {"sustenance": "bar"},
-    "replace": {"amenity": "bar"}
-  },
   {
     "old": {"sustenance": "cafe"},
     "replace": {"amenity": "cafe"}
   },
   {
-    "old": {"sustenance": "pub"},
-    "replace": {"amenity": "pub"}
-  },
-  {
-    "old": {"sustenance": "restaurant"},
-    "replace": {"amenity": "restaurant"}
-  },
-  {
+    "status": "typo",
     "old": {"theatre:type": "amphitheatre"},
     "replace": {"theatre:type": "amphi"}
   },
@@ -1714,6 +1797,7 @@
     "replace": {"leisure": "picnic_table"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"tourism": "resort"},
     "replace": {"leisure": "resort"}
   },
@@ -1722,26 +1806,44 @@
     "replace": {"power": "tower"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"tower:type": "anchor"},
     "replace": {"line_attachment": "anchor"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"tower:type": "branch", "branch:type": "cross"},
     "replace": {"line_management": "cross"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"tower:type": "branch", "branch:type": "loop"},
     "replace": {"line_management": "split"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"tower:type": "branch", "branch:type": "split"},
     "replace": {"line_management": "split"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "branch:type"
+    },
     "old": {"tower:type": "branch", "branch:type": "tap"},
     "replace": {"line_management": "branch"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"tower:type": "suspension"},
     "replace": {"line_attachment": "suspension"}
   },
@@ -1750,6 +1852,7 @@
     "replace": {"line_management": "termination"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"tower:type": "transposing"},
     "replace": {"line_management": "transpose"}
   },
@@ -1758,6 +1861,7 @@
     "replace": {"amenity": "townhall", "townhall:type": "village"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"transformer": "auto"},
     "replace": {"transformer": "yes", "windings:auto": "yes"}
   },
@@ -1766,6 +1870,7 @@
     "replace": {"transformer": "distribution"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"transformer": "traction"},
     "replace": {"transformer": "main"}
   },
@@ -1774,82 +1879,155 @@
     "replace": {"tunnel": "yes"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "audio", "amenity": "studio"},
     "replace": {"studio": "audio", "amenity": "studio"}
   },
   {
-    "old": {"type": "broad_leaved"},
+    "old": {"type": "broadleaved"},
     "replace": {"leaf_type": "broadleaved"}
   },
   {
-    "old": {"type": "caldera"},
-    "replace": {"volcano:type": "caldera"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
+    "old": {"natural": "volcano", "type": "caldera"},
+    "replace": {"natural": "volcano", "volcano:type": "caldera"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "conifer"},
     "replace": {"leaf_type": "needleleaved"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "deciduous"},
     "replace": {"leaf_cycle": "deciduous"}
   },
   {
-    "old": {"type": "extinct"},
-    "replace": {"volcano:status": "extinct"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
+    "old": {"natural": "volcano", "type": "extinct"},
+    "replace": {"natural": "volcano", "volcano:status": "extinct"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "gas", "man_made": "pipeline"},
     "replace": {"substance": "gas", "man_made": "pipeline"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "gas", "man_made": "pumping_rig"},
     "replace": {"substance": "gas", "man_made": "pumping_rig"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "gas", "pipeline": "*"},
     "replace": {"substance": "gas", "pipeline": "$1"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "oil", "man_made": "pipeline"},
     "replace": {"substance": "oil", "man_made": "pipeline"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "oil", "man_made": "pumping_rig"},
     "replace": {"substance": "oil", "man_made": "pumping_rig"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "oil", "pipeline": "*"},
     "replace": {"substance": "oil", "pipeline": "$1"}
   },
   {
-    "old": {"type": "scoria"},
-    "replace": {"volcano:type": "scoria"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
+    "old": {"natural": "volcano", "type": "scoria"},
+    "replace": {"natural": "volcano", "volcano:type": "scoria"}
   },
   {
-    "old": {"type": "shield"},
-    "replace": {"volcano:type": "shield"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
+    "old": {"natural": "volcano", "type": "shield"},
+    "replace": {"natural": "volcano", "volcano:type": "shield"}
   },
   {
-    "old": {"type": "strato"},
-    "replace": {"volcano:type": "stratovolcano"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
+    "old": {"natural": "volcano", "type": "strato"},
+    "replace": {"natural": "volcano", "volcano:type": "stratovolcano"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "video", "amenity": "studio"},
     "replace": {"studio": "video", "amenity": "studio"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "water", "man_made": "pipeline"},
     "replace": {"substance": "water", "man_made": "pipeline"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "water", "man_made": "reservoir_covered"},
     "replace": {"content": "water", "man_made": "reservoir_covered"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "type"
+    },
     "old": {"type": "water", "pipeline": "*"},
     "replace": {"substance": "water", "pipeline": "$1"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"unnamed": "*"},
     "replace": {"noname": "$1"}
   },
@@ -1862,26 +2040,27 @@
     "replace": {"volcano:status": "extinct"}
   },
   {
-    "old": {"voltage-high": "*", "transformer":"generator"},
-    "replace": {"voltage:secondary":"$1", "transformer":"generator"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "voltage-high"
+    },
+    "old": {"voltage-high": "*", "power": "transformer"},
+    "replace": {"voltage:secondary":"$1", "power": "transformer"}
   },
   {
-    "old": {"voltage-low": "*", "transformer":"generator"},
-    "replace": {"voltage:primary":"$1", "transformer":"generator"}
-  },
-  {
-    "old": {"voltage-high": "*"},
-    "replace": {"voltage:primary":"$1"}
-  },
-  {
-    "old": {"voltage-low": "*"},
-    "replace": {"voltage:secondary":"$1"}
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "voltage-low"
+    },
+    "old": {"voltage-low": "*", "power": "transformer"},
+    "replace": {"voltage:primary":"$1", "power": "transformer"}
   },
   {
     "old": {"wall_type": "noise_barrier"},
     "replace": {"wall": "noise_barrier"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"water": "intermittent"},
     "replace": {"natural": "water", "intermittent": "yes"}
   },
@@ -1890,22 +2069,17 @@
     "replace": {"natural": "water", "water": "river"}
   },
   {
-    "old": {"water": "salt"},
-    "replace": {"natural": "water", "salt": "yes"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"water": "tidal"},
     "replace": {"natural": "water", "tidal": "yes"}
   },
   {
-    "old": {"waterway": "aqueduct"},
-    "replace": {"waterway": "canal", "bridge": "aqueduct"}
-  },
-  {
+    "status": "wiki-deprecated",
     "old": {"waterway": "lock"},
     "replace": {"waterway": "canal", "lock": "yes"}
   },
   {
+    "status": "wiki-deprecated",
     "old": {"waterway": "riverbank"},
     "replace": {"natural": "water", "water": "river"}
   },
@@ -1926,37 +2100,37 @@
     "replace": {"female": "$1"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "wood"
+    },
     "old": {"wood": "coniferous"},
     "replace": {"leaf_type": "needleleaved"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "wood"
+    },
     "old": {"wood": "deciduous"},
     "replace": {"leaf_cycle": "deciduous"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "wood"
+    },
     "old": {"wood": "evergreen"},
     "replace": {"leaf_cycle": "evergreen"}
   },
   {
+    "status": "wiki-deprecated",
+    "reference": {
+      "key": "wood"
+    },
     "old": {"wood": "mixed"},
     "replace": {"leaf_cycle": "mixed", "leaf_type": "mixed"}
   },
-  {
-    "old": {"cycleway": "none"},
-    "replace": {"cycleway": "no"}
-  },
-  {
-    "old": {"cycleway:left": "none"},
-    "replace": {"cycleway:left": "no"}
-  },
-  {
-    "old": {"cycleway:right": "none"},
-    "replace": {"cycleway:right": "no"}
-  },
-  {
-    "old": {"cycleway:both": "none"},
-    "replace": {"cycleway:both": "no"}
-  },
   {
     "old": {"communication": "pole"},
     "replace": {"man_made": "utility_pole", "utility": "telecom"}
@@ -1972,17 +2146,5 @@
   {
     "old": {"pstn": "pole"},
     "replace": {"man_made": "utility_pole", "utility": "telecom"}
-  },
-  {
-    "old": {"memorial:type": "stolperstein"},
-    "replace": {"memorial": "stolperstein"}
-  },
-  {
-    "old": {"memorial:text": "*"},
-    "replace": {"inscription": "$1"}
-  },
-  {
-    "old": {"industrial": "brickworks"},
-    "replace": {"industrial": "brickyard"}
   }
 ]