diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 6bdf86a541..389fcb48e1 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -8,10 +8,10 @@ highway|footway;7;
 highway|track;8;
 highway|tertiary;9;
 power|tower;10;
-landuse|forest;11;
+landuse|forest;[landuse=forest],[natural=wood];;name;int_name;11;
 landuse|grass;12;
 highway|secondary;13;
-natural|wood;14;
+natural|wood;14;landuse|forest
 landuse|residential;15;
 highway|path;16;
 highway|bus_stop;17;
@@ -90,7 +90,7 @@ waterway|drain;89;
 waterway|canal;90;
 highway|trunk_link|oneway;[highway=trunk_link][oneway?];x;name;int_name;91;highway|trunk_link
 highway|unclassified|bridge;[highway=unclassified][bridge?];;name;int_name;92;
-landuse|forest|deciduous;[landuse=forest][wood=deciduous],[landuse=forest][leaf_type=deciduous],[landuse=forest][leaf_cycle=deciduous];;name;int_name;93;
+landuse|forest|deciduous;[landuse=forest][wood=deciduous],[landuse=forest][leaf_type=deciduous],[landuse=forest][leaf_cycle=deciduous],[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];;name;int_name;93;
 place|island;94;
 highway|primary|bridge;[highway=primary][bridge?];;name;int_name;95;
 highway|primary_link|oneway;[highway=primary_link][oneway?];x;name;int_name;96;highway|primary_link
@@ -127,9 +127,9 @@ amenity|kindergarten;126;
 power|generator|wind;[power=generator][power_source=wind];;name;int_name;127;x
 place|suburb;128;
 landuse|allotments;129;
-landuse|forest|coniferous;[landuse=forest][wood=coniferous],[landuse=forest][leaf_type=coniferous];;name;int_name;130;
-landuse|forest|mixed;[landuse=forest][wood=mixed],[landuse=forest][leaf_type=mixed],[landuse=forest][leaf_cycle=mixed];;name;int_name;131;
-natural|wood|mixed;[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];;name;int_name;132;
+landuse|forest|coniferous;[landuse=forest][wood=coniferous],[landuse=forest][leaf_type=coniferous],[natural=wood][wood=coniferous],[natural=wood][leaf_type=coniferous];;name;int_name;130;
+landuse|forest|mixed;[landuse=forest][wood=mixed],[landuse=forest][leaf_type=mixed],[landuse=forest][leaf_cycle=mixed],[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];;name;int_name;131;
+natural|wood|mixed;[natural=wood][wood=mixed],[natural=wood][leaf_type=mixed],[natural=wood][leaf_cycle=mixed];x;name;int_name;132;landuse|forest|mixed
 sport|tennis;133;
 landuse|vineyard;134;
 aeroway|taxiway;135;
@@ -169,7 +169,7 @@ highway|bridleway;168;
 natural|heath;169;
 landuse|basin;170;
 amenity|library;171;
-natural|wood|coniferous;[natural=wood][wood=coniferous],[natural=wood][leaf_type=coniferous];;name;int_name;172;
+natural|wood|coniferous;[natural=wood][wood=coniferous],[natural=wood][leaf_type=coniferous];x;name;int_name;172;landuse|forest|coniferous
 landuse|recreation_ground;173;
 landuse|village_green;174;
 amenity|drinking_water;175;
@@ -196,7 +196,7 @@ piste:type|nordic;195;
 highway|motorway;196;
 railway|crossing;197;
 boundary|national_park;198;
-natural|wood|deciduous;[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];;name;int_name;199;
+natural|wood|deciduous;[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];x;name;int_name;199;landuse|forest|deciduous
 waterway|dam;200;
 highway|motorway_link;201;
 leisure|golf_course;202;
@@ -382,7 +382,7 @@ landuse|basin|retention;[landuse=basin][basin=retention];x;name;int_name;381;nat
 railway|narrow_gauge|tunnel;[railway=narrow_gauge][tunnel?];;name;int_name;382;
 railway|dismantled;383;x
 waterway|dock;384;
-natural|forest;385;natural|wood
+natural|forest;385;landuse|forest
 highway|service|driveway|area;[highway=service][service=driveway][area?];x;name;int_name;386;highway|service|driveway
 man_made|pipeline|heat;[man_made=pipeline][type=heat];x;name;int_name;387;man_made|pipeline
 place|city|capital;[place=city][capital?];;name;int_name;388;
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index cd99cd860f..786cc9864c 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1280,7 +1280,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"landuse", "construction"},
     {"landuse", "farmland"},
     {"landuse", "field"},
-    {"landuse", "forest"},
     {"landuse", "garages"},
     {"landuse", "grass"},
     {"landuse", "industrial"},
@@ -1346,7 +1345,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"natural", "volcano"},
     {"natural", "water"},
     {"natural", "wetland"},
-    {"natural", "wood"},
     {"office", "company"},
     {"office", "estate_agent"},
     {"office", "government"},
@@ -1739,14 +1737,24 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial:type", "statue"}}},
     {{"internet_access"}, {{"internet_access", "any_value"}}},
     {{"landuse", "cemetery", "christian"}, {{"landuse", "cemetery"}, {"religion", "christian"}}},
+    {{"landuse", "forest"}, {{"landuse", "forest"}}},
+    {{"landuse", "forest"}, {{"natural", "wood"}}},
     {{"landuse", "forest", "coniferous"}, {{"landuse", "forest"}, {"leaf_type", "coniferous"}}},
     {{"landuse", "forest", "coniferous"}, {{"landuse", "forest"}, {"wood", "coniferous"}}},
+    {{"landuse", "forest", "coniferous"}, {{"natural", "wood"}, {"leaf_type", "coniferous"}}},
+    {{"landuse", "forest", "coniferous"}, {{"natural", "wood"}, {"wood", "coniferous"}}},
     {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"leaf_cycle", "deciduous"}}},
     {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"leaf_type", "deciduous"}}},
     {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"wood", "deciduous"}}},
+    {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"leaf_cycle", "deciduous"}}},
+    {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"leaf_type", "deciduous"}}},
+    {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"wood", "deciduous"}}},
     {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"leaf_cycle", "mixed"}}},
     {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"leaf_type", "mixed"}}},
     {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"wood", "mixed"}}},
+    {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"leaf_cycle", "mixed"}}},
+    {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"leaf_type", "mixed"}}},
+    {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"wood", "mixed"}}},
     {{"leisure", "park", "no-access"}, {{"leisure", "park"}, {"access", "no"}}},
     {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}},
     {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}},
@@ -1754,14 +1762,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"leisure", "sports_centre", "yoga"}, {{"leisure", "sports_centre"}, {"sport", "yoga"}}},
     {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
     {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
-    {{"natural", "wood", "coniferous"}, {{"natural", "wood"}, {"leaf_type", "coniferous"}}},
-    {{"natural", "wood", "coniferous"}, {{"natural", "wood"}, {"wood", "coniferous"}}},
-    {{"natural", "wood", "deciduous"}, {{"natural", "wood"}, {"leaf_cycle", "deciduous"}}},
-    {{"natural", "wood", "deciduous"}, {{"natural", "wood"}, {"leaf_type", "deciduous"}}},
-    {{"natural", "wood", "deciduous"}, {{"natural", "wood"}, {"wood", "deciduous"}}},
-    {{"natural", "wood", "mixed"}, {{"natural", "wood"}, {"leaf_cycle", "mixed"}}},
-    {{"natural", "wood", "mixed"}, {{"natural", "wood"}, {"leaf_type", "mixed"}}},
-    {{"natural", "wood", "mixed"}, {{"natural", "wood"}, {"wood", "mixed"}}},
     {{"office"}, {{"office", "any_value"}}},
     {{"piste:type", "downhill", "advanced"}, {{"piste:type", "downhill"}, {"piste:difficulty", "advanced"}}},
     {{"piste:type", "downhill", "easy"}, {{"piste:type", "downhill"}, {"piste:difficulty", "easy"}}},