diff --git a/data/classificator.txt b/data/classificator.txt
index c077aa5792..1b26891065 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -89,18 +89,23 @@ world  +
         nursing_home  -
         parcel_locker  -
         parking  +
-            fee  +
-                lane  -
-                street_side  -
+            fee  -
+            lane  +
+                fee  -
+                {}
+            multi-storey  +
+                fee  -
                 {}
-            lane  -
-            multi-storey  -
             no-access  -
             park_and_ride  -
             permissive  -
             private  -
-            street_side  -
-            underground  -
+            street_side  +
+                fee  -
+                {}
+            underground  +
+                fee  -
+                {}
             {}
         parking_entrance  +
             permissive  -
@@ -479,7 +484,6 @@ world  +
         service  +
             area  -
             bridge  -
-            busway  -
             driveway  -
             parking_aisle  -
             tunnel  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 865772504f..96457547c1 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 905f5b38e7..c13856f299 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -6471,134 +6471,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 15
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 15
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -6663,6 +6535,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -6739,6 +6675,82 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -7095,6 +7107,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -7156,6 +7232,67 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 15
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -27979,91 +28116,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 16777215
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 16777215
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index be4098f84c..4e05f75b39 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 f9887df425..87e817498f 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -6437,106 +6437,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -6587,6 +6487,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -6663,6 +6613,82 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -6991,6 +7017,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -7044,6 +7120,59 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -27793,82 +27922,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 16777215
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3f1b7fb84d..961fb9e474 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 8787b3ea82..6c48851e92 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -6437,106 +6437,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 17
-    area {
-      color: 2038555
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 17
-    area {
-      color: 2038555
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -6587,6 +6487,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 17
+    area {
+      color: 2038555
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -6663,6 +6613,82 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 2038555
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -6991,6 +7017,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 17
+    area {
+      color: 2038555
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -7044,6 +7120,59 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -27906,82 +28035,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 4933187
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 1118464
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 1118464
-      }
-      priority: 2800
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 21b1b5fba1..aafe2b1b25 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 1bb9de6fb9..2578ef0aa1 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -1981,132 +1981,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 15
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 15
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -2160,6 +2034,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -2259,6 +2196,105 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -2689,6 +2725,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -2768,6 +2867,85 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 15
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -14747,91 +14925,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 16579836
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 16579836
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 7.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 8.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2150
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 73726aab17..bf4cf9595b 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index e4aaaeefe2..7ca8cdcd24 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1981,132 +1981,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 15
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 15
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -2160,6 +2034,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -2259,6 +2196,105 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -2689,6 +2725,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -2768,6 +2867,85 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 15
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -15025,91 +15203,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 3354929
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 3354929
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 7.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 8.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
-      }
-      priority: 2150
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/types.txt b/data/types.txt
index bde533d14f..461ad28ec8 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -353,14 +353,14 @@ mapswithme
 *highway|cycleway|permissive
 *highway|unclassified|area
 *natural|volcano
-amenity|parking|underground
+*amenity|parking|underground|fee
 *amenity|parking|underground
 *amenity|parking|street_side
 *amenity|parking|multi-storey
 *leisure|recreation_ground
 *highway|footway|mountain_hiking
 highway|service|driveway
-amenity|parking|multi-storey
+*amenity|parking|multi-storey|fee
 *sport|9pin
 *sport|10pin
 *piste:type|downhill|novice
@@ -439,8 +439,8 @@ mapswithme
 mapswithme
 mapswithme
 *aerialway|t-bar
-*amenity|parking|fee|lane
-*amenity|parking|fee|street_side
+*amenity|parking|lane|fee
+*amenity|parking|street_side|fee
 *highway|path|difficult_alpine_hiking
 *earthquake:damage|spontaneous_camp
 *natural|water|drain
@@ -854,7 +854,7 @@ mapswithme
 *railway|rail|highspeed|tunnel
 *railway|rail|tourism|tunnel
 *mapswithme|grid
-*highway|service|busway
+highway|busway
 *highway|busway
 *highway|busway|bridge
 *highway|busway|tunnel
diff --git a/data/visibility.txt b/data/visibility.txt
index ddfc18df7c..e3b425cae7 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -89,18 +89,23 @@ world  00000000000000000000  +
         nursing_home  00000000000000000000  -
         parcel_locker  00000000000000000111  -
         parking  00000000000000011111  +
-            fee  00000000000000011111  +
-                lane  00000000000000011111  -
-                street_side  00000000000000011111  -
+            fee  00000000000000011111  -
+            lane  00000000000000011111  +
+                fee  00000000000000011111  -
+                {}
+            multi-storey  00000000000000011111  +
+                fee  00000000000000011111  -
                 {}
-            lane  00000000000000011111  -
-            multi-storey  00000000000000011111  -
             no-access  00000000000000011111  -
             park_and_ride  00000000000000011111  -
             permissive  00000000000000011111  -
             private  00000000000000011111  -
-            street_side  00000000000000011111  -
-            underground  00000000000000011111  -
+            street_side  00000000000000011111  +
+                fee  00000000000000011111  -
+                {}
+            underground  00000000000000011111  +
+                fee  00000000000000011111  -
+                {}
             {}
         parking_entrance  00000000000000001111  +
             permissive  00000000000000001111  -
@@ -479,7 +484,6 @@ world  00000000000000000000  +
         service  00000000000000111111  +
             area  00000000000000111111  -
             bridge  00000000000000111111  -
-            busway  00000000000000111111  -
             driveway  00000000000000011111  -
             parking_aisle  00000000000000111111  -
             tunnel  00000000000000111111  -