diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 62f4ae1c9a..e0858cc373 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2324,12 +2324,18 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"historic", "castle", "manor"}, {{"historic", "castle"}, {"castle_type", "manor"}}},
     {{"historic", "castle", "manor"}, {{"historic", "manor"}}},
     {{"historic", "castle", "stately"}, {{"historic", "castle"}, {"castle_type", "stately"}}},
+    {{"historic", "memorial", "cross"}, {{"historic", "memorial"}, {"memorial", "cross"}}},
     {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial", "plaque"}}},
     {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plaque"}}},
+    {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plate"}}},
     {{"historic", "memorial", "sculpture"}, {{"historic", "memorial"}, {"memorial", "sculpture"}}},
     {{"historic", "memorial", "sculpture"}, {{"historic", "memorial"}, {"memorial:type", "sculpture"}}},
     {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial", "statue"}}},
     {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial:type", "statue"}}},
+    {{"historic", "memorial", "stolperstein"}, {{"historic", "memorial"}, {"memorial", "stolperstein"}}},
+    {{"historic", "memorial", "stolperstein"}, {{"historic", "memorial"}, {"memorial:type", "stolperstein"}}},
+    {{"historic", "memorial", "war_memorial"}, {{"historic", "memorial"}, {"memorial", "war_memorial"}}},
+    {{"historic", "memorial", "war_memorial"}, {{"historic", "memorial"}, {"memorial:type", "war_memorial"}}},
     {{"internet_access"}, {{"internet_access", "any_value"}}},
     {{"landuse", "cemetery", "christian"}, {{"landuse", "cemetery"}, {"religion", "christian"}}},
     {{"landuse", "forest"}, {{"landuse", "forest"}}},
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 9c3b73d207..1d09f33153 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -578,43 +578,6 @@ void PreprocessElement(OsmElement * p)
     }
   }
 
-  // Merge attraction and memorial types to predefined set of values
-  p->UpdateTag("artwork_type", [](string & value) {
-    if (value.empty())
-      return;
-    if (value == "mural" || value == "graffiti" || value == "azulejo" || value == "tilework")
-      value = "painting";
-    else if (value == "stone" || value == "installation")
-      value = "sculpture";
-    else if (value == "bust")
-      value = "statue";
-  });
-
-  string const & memorialType = p->GetTag("memorial:type");
-  p->UpdateTag("memorial", [&memorialType](string & value) {
-    if (value.empty())
-    {
-      if (memorialType.empty())
-        return;
-      else
-        value = memorialType;
-    }
-
-    if (value == "blue_plaque" || value == "stolperstein")
-    {
-      value = "plaque";
-    }
-    else if (value == "war_memorial" || value == "stele" || value == "obelisk" ||
-             value == "stone" || value == "cross")
-    {
-      value = "sculpture";
-    }
-    else if (value == "bust" || value == "person")
-    {
-      value = "statue";
-    }
-  });
-
   p->UpdateTag("attraction", [](string & value) {
     // "specified" is a special value which means we have the "attraction" tag,
     // but its value is not "animal".