diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 48f831c643..82a59e8e81 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -76,7 +76,7 @@ landuse|industrial;75;
 barrier|wall;76;
 amenity|post_box;77;
 place|town;78;
-power|line;79;
+power|line;[power=line][!location];;name;int_name;79;
 landuse|farmyard;80;
 highway|residential|bridge;[highway=residential][bridge?];;name;int_name;81;
 railway|rail|bridge;[railway=rail][bridge?];;name;int_name;82;
@@ -256,7 +256,7 @@ deprecated|deprecated;255;x
 piste:type|downhill|intermediate;[piste:type=downhill][piste:difficulty=intermediate];;name;int_name;256;
 railway|subway_entrance;257;
 deprecated|deprecated;258;x
-man_made|pipeline;259;
+man_made|pipeline;[man_made=pipeline][!location];;name;int_name;259;
 route|ferry;260;
 highway|trunk_link|bridge;[highway=trunk_link][bridge?];;name;int_name;261;
 landuse|military;262;
@@ -302,7 +302,7 @@ man_made|storage_tank;301;
 man_made|silo;302;
 power|generator;303;
 highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;
-man_made|pipeline|overground;[man_made=pipeline][location=overground];;name;int_name;305;
+man_made|pipeline|overground;[man_made=pipeline][location=overground];x;name;int_name;305;man_made|pipeline
 natural|saddle;306;
 mountain_pass;[mountain_pass];;name;int_name;307;
 highway|raceway;308;
@@ -542,7 +542,7 @@ deprecated|deprecated;541;x
 amenity|speed_trap;542;highway|speed_camera
 area:highway|track;543;
 area:highway|primary;544;
-power|line|underground;[power=line][location=underground];;name;int_name;545;
+deprecated|deprecated;545;x
 deprecated|deprecated;546;x
 deprecated|deprecated;547;x
 deprecated|deprecated;548;x
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index 4da6c59098..4f297e9f3a 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -1244,7 +1244,7 @@ line|z12-14[piste:lift=magic_carpet],
 line|z12-14[piste:lift=platter],
 line|z12-14[piste:lift=rope_tow],
 line|z12-14[piste:lift=t-bar],
-line|z19-[power=line]
+line|z19-[power=line],
 {width: 1;}
 line|z15-[piste:lift],
 line|z15-[piste:lift=j-bar],
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index 78c68e4101..acb1c4b28d 100644
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -1266,7 +1266,7 @@ line|z12-14[piste:lift=magic_carpet],
 line|z12-14[piste:lift=platter],
 line|z12-14[piste:lift=rope_tow],
 line|z12-14[piste:lift=t-bar],
-line|z19-[power=line]
+line|z19-[power=line],
 {width: 1;}
 line|z15-[piste:lift],
 line|z15-[piste:lift=j-bar],
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 4112068a0a..2d63737fb0 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -81,7 +81,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SkipDummy)
   TEST_EQUAL(params.m_types[0], GetType({"highway", "primary"}), ());
 }
 
-UNIT_CLASS_TEST(TestWithClassificator, OsmType_Check)
+UNIT_CLASS_TEST(TestWithClassificator, OsmType_Oneway)
 {
   {
     Tags const tags = {
@@ -112,18 +112,47 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Check)
     TEST(params.IsTypeExist(GetType({"highway", "primary"})), ());
     TEST(params.IsTypeExist(GetType({"hwtag", "oneway"})), ());
   }
+}
+
+UNIT_CLASS_TEST(TestWithClassificator, OsmType_Location)
+{
+  {
+    Tags const tags = {
+      { "power", "line" },
+      { "location", "underground" },
+      { "man_made", "pipeline" },
+    };
+
+    auto const params = GetFeatureBuilderParams(tags);
+
+    TEST_EQUAL(params.m_types.size(), 0, (params));
+  }
 
   {
     Tags const tags = {
-      { "admin_level", "4" },
-      { "border_type", "state" },
-      { "boundary", "administrative" }
+      { "power", "line" },
+      { "man_made", "pipeline" },
     };
 
     auto const params = GetFeatureBuilderParams(tags);
 
     TEST_EQUAL(params.m_types.size(), 1, (params));
-    TEST(params.IsTypeExist(GetType({"boundary", "administrative", "4"})), ());
+    TEST(params.IsTypeExist(GetType({"power", "line"})), ());
+    // We don't have drawing rules now for pipeline.
+    //TEST(params.IsTypeExist(GetType({"man_made", "pipeline"})), ());
+  }
+
+  {
+    Tags const tags = {
+      { "power", "line" },
+      { "location", "overground" },
+      { "man_made", "pipeline" },
+    };
+
+    auto const params = GetFeatureBuilderParams(tags);
+
+    /// @todo Mapcss understands only [!location] syntax now. Make it possible to set [!location=underground]
+    TEST_EQUAL(params.m_types.size(), 0, (params));
   }
 }