diff --git a/data/classificator.txt b/data/classificator.txt
index c03f724f60..37151509e8 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -575,9 +575,7 @@ world  +
         lighthouse  -
         mast  -
         pier  -
-        pipeline  +
-            overground  -
-            {}
+        pipeline  -
         silo  -
         storage_tank  -
         surveillance  -
@@ -645,6 +643,10 @@ world  +
         ngo  -
         telecommunication  -
         {}
+    organic  +
+        only  -
+        yes  -
+        {}
     piste:lift  +
         j-bar  -
         magic_carpet  -
@@ -702,9 +704,7 @@ world  +
         {}
     power  +
         generator  -
-        line  +
-            underground  -
-            {}
+        line  -
         minor_line  -
         pole  -
         station  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f6f9ae2089..08337b175e 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index ddb9f9c087..c78ebe51f9 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -51792,17 +51792,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-line-underground"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1572
-    }
-  }
-}
 cont {
   name: "power-station"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 4ae06b7ad3..fcee912cc2 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index b6f4534cd8..1ffe594269 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -51454,17 +51454,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-line-underground"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1572
-    }
-  }
-}
 cont {
   name: "power-station"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 0f5cddb423..9135898dc3 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 8ba797440a..540c1f24ee 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -51572,17 +51572,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-line-underground"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1572
-    }
-  }
-}
 cont {
   name: "power-station"
   element {
diff --git a/data/types.txt b/data/types.txt
index 49fd56ce67..943e07bd0d 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -302,7 +302,7 @@ mapswithme
 *man_made|silo
 *power|generator
 *highway|pedestrian|bridge
-*man_made|pipeline|overground
+man_made|pipeline
 *natural|saddle
 *mountain_pass
 *highway|raceway
@@ -542,7 +542,7 @@ mapswithme
 highway|speed_camera
 *area:highway|track
 *area:highway|primary
-*power|line|underground
+mapswithme
 mapswithme
 mapswithme
 mapswithme
@@ -1122,8 +1122,8 @@ mapswithme
 *wheelchair|no
 *wheelchair|limited
 *building|has_parts
-mapswithme
-mapswithme
+*organic|only
+*organic|yes
 mapswithme
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index 0a084df1b1..53efa70c4a 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -575,9 +575,7 @@ world  00000000000000000000  +
         lighthouse  00000000000000000000  -
         mast  00000000000000000000  -
         pier  00000000000001111111  -
-        pipeline  00000000000000000000  +
-            overground  00000000000000000000  -
-            {}
+        pipeline  00000000000000000000  -
         silo  00000000000000000000  -
         storage_tank  00000000000000000000  -
         surveillance  00000000000000000000  -
@@ -645,6 +643,10 @@ world  00000000000000000000  +
         ngo  00000000000000000000  -
         telecommunication  00000000000000000000  -
         {}
+    organic  00000000000000000000  +
+        only  00000000000000000000  -
+        yes  00000000000000000000  -
+        {}
     piste:lift  00000000000000000000  +
         j-bar  00000000000000000000  -
         magic_carpet  00000000000000000000  -
@@ -702,9 +704,7 @@ world  00000000000000000000  +
         {}
     power  00000000000000000000  +
         generator  00000000000000000000  -
-        line  00000000000000000000  +
-            underground  00000000000000000000  -
-            {}
+        line  00000000000000000000  -
         minor_line  00000000000000000000  -
         pole  00000000000000000000  -
         station  00000000000000000000  -