diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json
index 353cbf11480b5..85e314fbf8c9d 100644
--- a/data/json/overmap/map_extras.json
+++ b/data/json/overmap/map_extras.json
@@ -8,7 +8,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": "o",
     "color": "red",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_collegekids",
@@ -20,7 +21,7 @@
     "sym": "c",
     "color": "light_red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_drugdeal",
@@ -32,7 +33,7 @@
     "sym": "d",
     "color": "light_red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_roadworks",
@@ -44,7 +45,7 @@
     "sym": "X",
     "color": "yellow",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_mayhem",
@@ -56,7 +57,7 @@
     "sym": "M",
     "color": "light_red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_roadblock",
@@ -68,7 +69,7 @@
     "sym": "X",
     "color": "blue",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_roadblock_mil",
@@ -80,7 +81,7 @@
     "sym": "X",
     "color": "red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_bandits_block",
@@ -93,7 +94,7 @@
     "color": "red",
     "//": "Can't be true because it doesn't always place anything",
     "autonote": false,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_minefield",
@@ -105,7 +106,7 @@
     "sym": "M",
     "color": "red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_supplydrop",
@@ -117,7 +118,7 @@
     "sym": "C",
     "color": "yellow",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_military",
@@ -129,7 +130,7 @@
     "sym": "m",
     "color": "light_red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_helicopter",
@@ -141,7 +142,7 @@
     "sym": "X",
     "color": "light_blue",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_science",
@@ -257,7 +258,7 @@
     "sym": "c",
     "color": "light_red",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_spider",
@@ -298,7 +299,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": "F",
     "color": "light_green",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_shrubbery",
@@ -309,7 +311,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": "s",
     "color": "light_green",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_clearcut",
@@ -320,7 +323,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": ".",
     "color": "brown",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_pond",
@@ -331,7 +335,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": "p",
     "color": "blue",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_pond_forest",
@@ -339,14 +344,16 @@
     "name": { "str": "basin" },
     "description": "Small basin is here.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_pond_forest" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_pond_forest_2",
     "type": "map_extra",
     "copy-from": "mx_pond_forest",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_pond_forest_2" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_pond_swamp",
@@ -354,14 +361,16 @@
     "name": { "str": "bog" },
     "description": "Small bog is here.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_pond_swamp" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_pond_swamp_2",
     "type": "map_extra",
     "copy-from": "mx_pond_swamp",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_pond_swamp_2" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_trees",
@@ -369,28 +378,32 @@
     "name": { "str": "Stand of trees" },
     "description": "A copse of trees.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees_map" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_trees2",
     "type": "map_extra",
     "copy-from": "mx_trees",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees2_map" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_blackberry_patch",
     "type": "map_extra",
     "name": { "str": "Blackberry patch" },
     "description": "Blackberry bushes have spread here.",
-    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_blackberry_patch" }
+    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_blackberry_patch" },
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_knotweed_patch",
     "type": "map_extra",
     "name": { "str": "Japanese knotweed patch" },
     "description": "Japanese knotweed shrubs have spread here.",
-    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_knotweed_patch" }
+    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_knotweed_patch" },
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_grass",
@@ -398,14 +411,16 @@
     "name": { "str": "Tall grass" },
     "description": "A meadow of tall grass.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grass_map" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_grass2",
     "type": "map_extra",
     "copy-from": "mx_grass",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grass2_map" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_fallen_shed",
@@ -417,7 +432,7 @@
     "sym": "^",
     "color": "dark_gray",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_clay_deposit",
@@ -428,7 +443,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": "c",
     "color": "brown",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_sand_patch",
@@ -439,7 +455,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": ".",
     "color": "yellow",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_dead_vegetation",
@@ -450,7 +467,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": ".",
     "color": "brown",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_point_dead_vegetation",
@@ -461,7 +479,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": ".",
     "color": "brown",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_burned_ground",
@@ -472,7 +491,8 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": ".",
     "color": "light_gray",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_point_burned_ground",
@@ -483,7 +503,8 @@
     "min_max_zlevel": [ 0, 5 ],
     "sym": ".",
     "color": "light_gray",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_kelp_patch",
@@ -494,7 +515,8 @@
     "min_max_zlevel": [ -9, -9 ],
     "sym": "~",
     "color": "green",
-    "autonote": true
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_marloss_pilgrimage",
@@ -517,7 +539,7 @@
     "sym": "c",
     "color": "dark_gray",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_looters",
@@ -526,7 +548,7 @@
     "description": "Some looters gathering everything not nailed down.",
     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_looters" },
     "min_max_zlevel": [ -2, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_corpses",
@@ -535,7 +557,7 @@
     "description": "Some unfortunates from the billions lost in the Cataclysm.",
     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_corpses" },
     "min_max_zlevel": [ -5, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_nest_wasp",
@@ -566,7 +588,7 @@
     "description": "A prison bus.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_prison_bus" },
     "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_mass_grave",
@@ -578,7 +600,7 @@
     "sym": "X",
     "color": "yellow",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_grave",
@@ -587,7 +609,7 @@
     "description": "A grave.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_grave" },
     "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_city_trap",
@@ -599,7 +621,7 @@
     "color": "green",
     "autonote": true,
     "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_laststand",
@@ -611,7 +633,7 @@
     "color": "green",
     "autonote": true,
     "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_fungal_zone",
@@ -631,7 +653,8 @@
     "name": { "str": "Reed" },
     "description": "Water vegetation.",
     "generator": { "generator_method": "map_extra_function", "generator_id": "mx_reed" },
-    "min_max_zlevel": [ 0, 0 ]
+    "min_max_zlevel": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
   },
   {
     "id": "mx_riverside_boat",
@@ -640,7 +663,7 @@
     "description": "A small boat.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_riverside_boat" },
     "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_toxic_waste",
@@ -651,7 +674,7 @@
     "sym": "D",
     "color": "magenta",
     "autonote": true,
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_prison_van",
@@ -660,7 +683,7 @@
     "description": "A violent escape.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_prison_van" },
     "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "MAN_MADE" ]
+    "flags": [ "MAN_MADE", "CLASSIC" ]
   },
   {
     "id": "mx_beehive_natural",