diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 3181b7979..0b085b5e2 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -86,7 +86,6 @@ highway=platform : highway=pedestrian
 
 man_made=quay : man_made=pier
 
-natural=marsh     : natural=wetland, wetland=marsh
 natural=waterfall : waterway=waterfall
 natural=forest    : natural=wood
 natural=shrubbery : natural=scrub
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index fc1d21444..333e342e9 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2935,6 +2935,14 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}},
     {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
     {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
+    {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "wet_meadow"}}},
+    {{"natural", "wetland", "saltmarsh"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}}},
+    {{"natural", "wetland", "saltmarsh", "tidal"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}, {"tidal", "yes"}}},
+    {{"natural", "wetland", "fen"}, {{"natural", "wetland"}, {"wetland", "fen"}}},
+    {{"natural", "wetland", "reedbed"}, {{"natural", "wetland"}, {"wetland", "reedbed"}}},
+    {{"natural", "wetland", "swamp"}, {{"natural", "wetland"}, {"wetland", "swamp"}}},
+    {{"natural", "wetland", "mangrove"}, {{"natural", "wetland"}, {"wetland", "mangrove"}}},
+    {{"natural", "wetland", "tidalflat"}, {{"natural", "wetland"}, {"wetland", "tidalflat"}}},
     {{"office"}, {{"office", "any_value"}}},
     {{"piste:type", "downhill", "advanced"}, {{"piste:type", "downhill"}, {"piste:difficulty", "advanced"}}},
     {{"piste:type", "downhill", "easy"}, {{"piste:type", "downhill"}, {"piste:difficulty", "easy"}}},
diff --git a/generator/generator_tests/tag_admixer_test.cpp b/generator/generator_tests/tag_admixer_test.cpp
index c74edf266..e8d86d972 100644
--- a/generator/generator_tests/tag_admixer_test.cpp
+++ b/generator/generator_tests/tag_admixer_test.cpp
@@ -72,10 +72,6 @@ UNIT_TEST(TagsReplacer_Smoke)
         "  aerodrome:type   =   international   :    aerodrome   =  international   ";
     TestReplacer(source, {{{"aerodrome:type", "international"}, {{"aerodrome", "international"}}}});
   }
-  {
-    std::string const source = "natural=marsh : natural=wetland, wetland=marsh";
-    TestReplacer(source, {{{"natural", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}}});
-  }
   {
     std::string const source =
         "natural = forest : natural = wood\n"