diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index ad16c3fa8d..13c9469e19 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 f36ae996b0..554d805e38 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -30763,6 +30763,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -30784,6 +30785,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -30820,19 +30822,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30870,19 +30859,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30920,19 +30896,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30970,19 +30933,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31024,15 +30974,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31074,15 +31015,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31116,6 +31048,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31137,6 +31070,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31173,19 +31107,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31223,19 +31144,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31273,19 +31181,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31323,19 +31218,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31377,15 +31259,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31427,15 +31300,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31469,6 +31333,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31490,6 +31355,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31526,19 +31392,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31576,19 +31429,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31626,19 +31466,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31676,19 +31503,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31730,15 +31544,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31780,15 +31585,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31822,6 +31618,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31843,6 +31640,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31879,19 +31677,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31929,19 +31714,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31979,19 +31751,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -32029,19 +31788,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -32083,15 +31829,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -32133,15 +31870,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 2b737f43f3..4b9efcf7f1 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 5559507abe..610ffb21ea 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -30555,6 +30555,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -30576,6 +30577,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -30612,19 +30614,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30662,19 +30651,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30712,19 +30688,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30762,19 +30725,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30816,15 +30766,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30866,15 +30807,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -30908,6 +30840,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -30929,6 +30862,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -30965,19 +30899,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31015,19 +30936,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31065,19 +30973,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31115,19 +31010,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31169,15 +31051,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31219,15 +31092,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31261,6 +31125,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31282,6 +31147,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31318,19 +31184,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31368,19 +31221,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31418,19 +31258,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31468,19 +31295,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31522,15 +31336,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31572,15 +31377,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31614,6 +31410,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31635,6 +31432,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31671,19 +31469,6 @@ cont {
       color: 11453035
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31721,19 +31506,6 @@ cont {
       color: 11584112
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31771,19 +31543,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31821,19 +31580,6 @@ cont {
       color: 11190117
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31875,15 +31621,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31925,15 +31662,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 5502193ddf..a17baf3c3d 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 bb7e066b2d..ae78723a72 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -30706,6 +30706,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -30727,6 +30728,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -30763,19 +30765,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756480
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30813,19 +30802,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30863,19 +30839,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30913,19 +30876,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -30967,15 +30917,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31017,15 +30958,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31059,6 +30991,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31080,6 +31013,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31116,19 +31050,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756480
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31166,19 +31087,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31216,19 +31124,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31266,19 +31161,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31320,15 +31202,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31370,15 +31243,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31412,6 +31276,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31433,6 +31298,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31469,19 +31335,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756480
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31519,19 +31372,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31569,19 +31409,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31619,19 +31446,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31673,15 +31487,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31723,15 +31528,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
@@ -31765,6 +31561,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -31786,6 +31583,7 @@ cont {
       }
       priority: 15060
     }
+    apply_if: "name"
   }
   element {
     scale: 14
@@ -31822,19 +31620,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-s"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756480
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31872,19 +31657,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31922,19 +31694,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -31972,19 +31731,6 @@ cont {
       color: 1317888
       priority: -15940
     }
-    symbol {
-      name: "nparkf-m"
-      priority: 16060
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -32026,15 +31772,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
   element {
@@ -32076,15 +31813,6 @@ cont {
       name: "nparkf-m"
       priority: 16060
     }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15060
-    }
     apply_if: "!name"
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index b314b6c9c2..631b519e0e 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 613d9ae17a..c6961e06fd 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -19048,7 +19048,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -19070,38 +19070,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -19111,6 +19081,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19121,32 +19092,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 13031851
       priority: -15907
@@ -19162,6 +19111,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19172,34 +19122,12 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
-      color: 13163437
+      color: 13031851
       priority: -15907
     }
     apply_if: "!name"
@@ -19213,6 +19141,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19223,32 +19152,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 13163437
       priority: -15907
@@ -19264,6 +19171,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19274,7 +19182,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 13163437
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -19283,7 +19199,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -19291,25 +19207,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -19320,16 +19224,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -19338,7 +19233,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -19346,25 +19241,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -19375,16 +19258,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
@@ -19423,7 +19297,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -19445,38 +19319,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -19486,6 +19330,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19496,32 +19341,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 13031851
       priority: -15907
@@ -19537,6 +19360,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19547,34 +19371,12 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
-      color: 13163437
+      color: 13031851
       priority: -15907
     }
     apply_if: "!name"
@@ -19588,6 +19390,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19598,32 +19401,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 13163437
       priority: -15907
@@ -19639,6 +19420,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19649,7 +19431,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 13163437
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -19658,7 +19448,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -19666,25 +19456,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -19695,16 +19473,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -19713,7 +19482,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -19721,25 +19490,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -19750,16 +19507,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
@@ -19798,7 +19546,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -19820,38 +19568,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -19861,6 +19579,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19871,32 +19590,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 13031851
       priority: -15907
@@ -19912,6 +19609,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19922,34 +19620,12 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
-      color: 13163437
+      color: 13031851
       priority: -15907
     }
     apply_if: "!name"
@@ -19963,6 +19639,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19973,32 +19650,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 13163437
       priority: -15907
@@ -20014,6 +19669,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20024,7 +19680,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 13163437
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -20033,7 +19697,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20041,25 +19705,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -20070,16 +19722,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -20088,7 +19731,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20096,25 +19739,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -20125,16 +19756,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
@@ -20173,7 +19795,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -20195,38 +19817,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -20236,6 +19828,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20246,32 +19839,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 13031851
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 13031851
       priority: -15907
@@ -20287,6 +19858,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20297,34 +19869,12 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
-      color: 13163437
+      color: 13031851
       priority: -15907
     }
     apply_if: "!name"
@@ -20338,6 +19888,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20348,32 +19899,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 13163437
       priority: -15907
@@ -20389,6 +19918,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20399,7 +19929,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 13163437
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -20408,7 +19946,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20416,25 +19954,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -20445,16 +19971,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -20463,7 +19980,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20471,25 +19988,13 @@ cont {
       primary {
         height: 13
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 13163437
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -20500,16 +20005,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index f9064a7d7c..82c90b161a 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 c958b65f87..9b66771ce3 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -19438,7 +19438,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -19460,38 +19460,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -19501,6 +19471,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19511,32 +19482,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 593674
       priority: -15907
@@ -19552,6 +19501,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19562,32 +19512,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
       color: 593674
       priority: -15907
@@ -19603,6 +19531,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19613,32 +19542,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 593674
       priority: -15907
@@ -19654,6 +19561,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19664,7 +19572,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -19673,7 +19589,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -19681,25 +19597,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -19710,16 +19614,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -19728,7 +19623,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -19736,25 +19631,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -19765,16 +19648,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
@@ -19813,7 +19687,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -19835,38 +19709,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -19876,6 +19720,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19886,32 +19731,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 593674
       priority: -15907
@@ -19927,6 +19750,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19937,32 +19761,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
       color: 593674
       priority: -15907
@@ -19978,6 +19780,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -19988,32 +19791,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 593674
       priority: -15907
@@ -20029,6 +19810,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20039,7 +19821,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -20048,7 +19838,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20056,25 +19846,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -20085,16 +19863,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -20103,7 +19872,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20111,25 +19880,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -20140,16 +19897,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
@@ -20188,7 +19936,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -20210,38 +19958,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -20251,6 +19969,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20261,32 +19980,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 593674
       priority: -15907
@@ -20302,6 +19999,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20312,32 +20010,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
       color: 593674
       priority: -15907
@@ -20353,6 +20029,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20363,32 +20040,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 593674
       priority: -15907
@@ -20404,6 +20059,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20414,7 +20070,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -20423,7 +20087,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20431,25 +20095,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -20460,16 +20112,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -20478,7 +20121,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20486,25 +20129,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -20515,16 +20146,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {
@@ -20563,7 +20185,7 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
   }
   element {
     scale: 13
@@ -20585,38 +20207,8 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
-  element {
-    scale: 14
-    area {
-      color: 593674
-      priority: -15907
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 14
     area {
@@ -20626,6 +20218,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20636,32 +20229,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 15
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 15
+    scale: 14
     area {
       color: 593674
       priority: -15907
@@ -20677,6 +20248,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20687,32 +20259,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 16
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 16
+    scale: 15
     area {
       color: 593674
       priority: -15907
@@ -20728,6 +20278,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20738,32 +20289,10 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
-  }
-  element {
-    scale: 17
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 856756497
-        offset_y: 1
-      }
-      priority: 15093
-    }
     apply_if: "name"
   }
   element {
-    scale: 17
+    scale: 16
     area {
       color: 593674
       priority: -15907
@@ -20779,6 +20308,7 @@ cont {
     symbol {
       name: "nparkf-m"
       priority: 16093
+      min_distance: 10
     }
     caption {
       primary {
@@ -20789,7 +20319,15 @@ cont {
       }
       priority: 15093
     }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -15907
+    }
+    apply_if: "!name"
   }
   element {
     scale: 18
@@ -20798,7 +20336,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20806,25 +20344,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     area {
@@ -20835,16 +20361,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
   element {
     scale: 19
@@ -20853,7 +20370,7 @@ cont {
       priority: -15907
     }
     symbol {
-      name: "park-m"
+      name: "nparkf-m"
       priority: 16093
       min_distance: 10
     }
@@ -20861,25 +20378,13 @@ cont {
       primary {
         height: 13
         color: 2836760
-        stroke_color: 856756497
+        stroke_color: 437326080
         offset_y: 1
       }
       priority: 15093
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    area {
-      color: 593674
-      priority: -15907
-    }
-    symbol {
-      name: "park-m"
-      priority: 16093
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     area {
@@ -20890,16 +20395,7 @@ cont {
       name: "nparkf-m"
       priority: 16093
     }
-    caption {
-      primary {
-        height: 13
-        color: 2836760
-        stroke_color: 437326080
-        offset_y: 1
-      }
-      priority: 15093
-    }
-    apply_if: "extra_tag=boundary=national_park"
+    apply_if: "!name"
   }
 }
 cont {