Index: applications/editors/josm/plugins/roadsigns/data/roadsignpresetBE.xml
===================================================================
--- applications/editors/josm/plugins/roadsigns/data/roadsignpresetBE.xml	(revision 36037)
+++ applications/editors/josm/plugins/roadsigns/data/roadsignpresetBE.xml	(revision 36038)
@@ -330,8 +330,8 @@
     <supplementary id="BE:M3_nl"/> <!--except_for_bicycles_and_moped_a_nl-->
     <supplementary id="BE:M3_fr"/> <!--except_for_bicycles_and_moped_a_fr-->
-	<supplementary id="BE:M11_nl"/> <!--except_for_bicycles_and_moped_p_nl-->
-    <supplementary id="BE:M11_fr"/> <!--except_for_bicycles_and_moped_p_fr-->
-	<supplementary id="BE:M12_nl"/> <!--except_for_bicycles_moped_a_and_moped_p_nl-->
-    <supplementary id="BE:M12_fr"/> <!--except_for_bicycles_moped_a_and_moped_p_fr-->
+    <supplementary id="BE:M11_nl"/> <!--except_for_bicycles_and_speed_pedelec_nl-->
+    <supplementary id="BE:M11_fr"/> <!--except_for_bicycles_and_speed_pedelec_fr-->
+    <supplementary id="BE:M12_nl"/> <!--except_for_bicycles_moped_a_and_speed_pedelec_nl-->
+    <supplementary id="BE:M12_fr"/> <!--except_for_bicycles_moped_a_and_speed_pedelec_fr-->
     <supplementary id="BE:Type_IV"/> <!--except for vehicle type"-->
   </sign>
@@ -339,19 +339,19 @@
     name="All vehicles prohibited"
     nl.name="Verboden doorgang voor alle voertuigen">
-	<tag key="horse" value="no"/>
-	<tag key="vehicle" value="no"/>
-	<supplementary id="BE:M2_nl"/> <!--except_for_bicycles_nl-->
+    <tag key="horse" value="no"/>
+    <tag key="vehicle" value="no"/>
+    <supplementary id="BE:M2_nl"/> <!--except_for_bicycles_nl-->
     <supplementary id="BE:M2_fr"/> <!--except_for_bicycles_fr-->
     <supplementary id="BE:M3_nl"/> <!--except_for_bicycles_and_moped_a_nl-->
     <supplementary id="BE:M3_fr"/> <!--except_for_bicycles_and_moped_a_fr-->
-	<supplementary id="BE:M11_nl"/> <!--except_for_bicycles_and_moped_p_nl-->
-    <supplementary id="BE:M11_fr"/> <!--except_for_bicycles_and_moped_p_fr-->
-	<supplementary id="BE:M12_nl"/> <!--except_for_bicycles_moped_a_and_moped_p_nl-->
-    <supplementary id="BE:M12_fr"/> <!--except_for_bicycles_moped_a_and_moped_p_fr-->
-	<supplementary id="BE:Type_IV_local_traffic_nl"/>
-	<supplementary id="BE:Type_IV_local_traffic_fr"/>    
-	<supplementary id="BE:Type_IV_residents_nl" />
-	<supplementary id="BE:Type_IV_residents_exceptions_nl" />
-	<supplementary id="BE:ZONE"/>
+    <supplementary id="BE:M11_nl"/> <!--except_for_bicycles_and_speed_pedelec_nl-->
+    <supplementary id="BE:M11_fr"/> <!--except_for_bicycles_and_speed_pedelec_fr-->
+    <supplementary id="BE:M12_nl"/> <!--except_for_bicycles_moped_a_and_speed_pedelec_nl-->
+    <supplementary id="BE:M12_fr"/> <!--except_for_bicycles_moped_a_and_speed_pedelec_fr-->
+    <supplementary id="BE:Type_IV_local_traffic_nl"/>
+    <supplementary id="BE:Type_IV_local_traffic_fr"/>    
+    <supplementary id="BE:Type_IV_residents_nl" />
+    <supplementary id="BE:Type_IV_residents_exceptions_nl" />
+    <supplementary id="BE:ZONE"/>
   </sign>
   <sign ref="BE:C5"
@@ -360,8 +360,8 @@
     wiki="Key:motorcar">
     <tag key="motor_vehicle" value="no"/>
-	<tag key="motorcycle" value="yes"/>
-	<tag key="mofa" value="yes"/>
-	<tag key="moped" value="yes"/>
-	<tag key="moped_p" value="yes"/>
+    <tag key="motorcycle" value="yes"/>
+    <tag key="mofa" value="yes"/>
+    <tag key="moped" value="yes"/>
+    <tag key="speed_pedelec" value="yes"/>
     <supplementary id="BE:ZONE"/>
   </sign>
@@ -382,6 +382,6 @@
     nl.name="Verboden voor motorfietsen">
     <tag key="mofa" value="no"/>
-	<tag key="moped" value="no"/>
-	<tag key="moped_p" value="no"/>
+    <tag key="moped" value="no"/>
+    <tag key="speed_pedelec" value="no"/>
   </sign>
   <sign ref="BE:C11"
@@ -396,5 +396,5 @@
     name="Horse carriages prohibited"
     nl.name="Verboden voor paardrijtuigen">
-	<tag key="carriage" value="no"/>
+    <tag key="carriage" value="no"/>
     <supplementary id="BE:ZONE"/>
   </sign>
@@ -432,8 +432,8 @@
   </sign>
   <sign ref="BE:C22"
-	name="No entry for coaches"
-	nl.name="Verboden toegang voor bestuurders van autocars.">
-	<tag key="tourist_bus" value="no"/>
-	<tag key="coach" value="no"/>
+    name="No entry for coaches"
+    nl.name="Verboden toegang voor bestuurders van autocars.">
+    <tag key="tourist_bus" value="no"/>
+    <tag key="coach" value="no"/>
   </sign>
   <sign ref="BE:C23"
@@ -458,5 +458,5 @@
     name="Hazardous explosive cargo prohibited"
     nl.name="Verboden toegang voor bestuurders van voertuigen die gevaarlijke ontvlambare of ontplofbare stoffen vervoeren">
-    <tag key=" 	access:explosives" value="no" ident="mode"/>
+    <tag key="     access:explosives" value="no" ident="mode"/>
     <supplementary id="BE:Type_Ia"/> <!--Coming up in x m"-->
     <supplementary id="BE:ZONE"/>
@@ -533,5 +533,5 @@
     nl.name="Verboden af te slaan naar rechts"
     wiki="Relation:restriction"
-	help="The RoadSigns plugin does not handle relations at this point. Please tag this turn restriction manually. Read wiki for more information on how to map."	>
+    help="The RoadSigns plugin does not handle relations at this point. Please tag this turn restriction manually. Read wiki for more information on how to map."    >
   </sign>
   <sign ref="BE:C31g"
@@ -539,5 +539,5 @@
     nl.name="Verboden af te slaan naar links"
     wiki="Relation:restriction"
-	help="The RoadSigns plugin does not handle relations at this point. Please tag this turn restriction manually. Read wiki for more information on how to map." >
+    help="The RoadSigns plugin does not handle relations at this point. Please tag this turn restriction manually. Read wiki for more information on how to map." >
   </sign>
   <sign ref="BE:C33"
@@ -545,5 +545,5 @@
     nl.name="Verboden terug te keren"
     wiki="Relation:restriction"
-	help="The RoadSigns plugin does not handle relations at this point. Please tag this turn restriction manually. Read wiki for more information on how to map." >
+    help="The RoadSigns plugin does not handle relations at this point. Please tag this turn restriction manually. Read wiki for more information on how to map." >
   </sign>
   <sign ref="BE:C35"
@@ -551,6 +551,6 @@
     nl.name="Voorbijsteken verboden"
     wiki="Key:overtaking"
-	help="Use overtaking=forward if overtaking is allowed when driving in the direction of the way but not in the other direction.
-	Use overtaking=backward if overtaking is allowed when driving against the direction of the way but not in the other direction.">
+    help="Use overtaking=forward if overtaking is allowed when driving in the direction of the way but not in the other direction.
+    Use overtaking=backward if overtaking is allowed when driving against the direction of the way but not in the other direction.">
     <tag key="overtaking" value="no"/>
     <supplementary id="BE:Type_II"/> <!--Over the following x m"-->
@@ -561,5 +561,5 @@
     nl.name="Einde verbod op voorbijsteken"
     wiki="Key:overtaking"
-	help="No specific tags needed, as overtaking=yes is assumed default ">
+    help="No specific tags needed, as overtaking=yes is assumed default ">
     <supplementary id="BE:ZONE"/>
   </sign>
@@ -568,6 +568,6 @@
     nl.name="Voorbijsteken verboden voor vrachtwagens +3.5t"
     wiki="Key:overtaking"
-	help="Use overtaking:hgv=forward if overtaking is allowed for trucks when driving in the direction of the way but not in the other direction.
-	Use overtaking:hgv=backward if overtaking is allowed for trucks when driving against the direction of the way but not in the other direction.">
+    help="Use overtaking:hgv=forward if overtaking is allowed for trucks when driving in the direction of the way but not in the other direction.
+    Use overtaking:hgv=backward if overtaking is allowed for trucks when driving against the direction of the way but not in the other direction.">
     <tag key="overtaking:hgv" value="no"/>
     <supplementary id="BE:Type_II"/> <!--Over the following x m"-->
@@ -578,5 +578,5 @@
     nl.name="Einde verbod op voorbijsteken voor vrachtwagens +3.5t"
     wiki="Key:overtaking"
-	help="No specific tags needed, as overtaking=yes is assumed default ">
+    help="No specific tags needed, as overtaking=yes is assumed default ">
    <supplementary id="BE:ZONE"/>
   </sign>
@@ -597,5 +597,5 @@
       />
     <supplementary id="BE:Type_VI_nl"/> <!--Herhaling-->
-	<supplementary id="BE:Type_VIIa"/> <!--Max weight specification"-->
+    <supplementary id="BE:Type_VIIa"/> <!--Max weight specification"-->
   </sign>
   <sign ref="BE:C45"
@@ -650,7 +650,7 @@
     nl.name="Verboden voor gemotoriseerde voertuigen">
     <tag key="motor_vehicle" value="no"/>
-	<tag key="mofa" value="yes"/>
-	<tag key="moped" value="yes"/>
-	<tag key="moped_p" value="yes"/>
+    <tag key="mofa" value="yes"/>
+    <tag key="moped" value="yes"/>
+    <tag key="speed_pedelec" value="yes"/>
     <supplementary id="BE:ZONE"/>
   </sign>
@@ -665,7 +665,7 @@
     nl.name="Verboden voor (motor)fietsen">
     <tag key="bicycle" value="no"/>
-	<tag key="mofa" value="no"/>
-	<tag key="moped" value="no"/>
-	<tag key="moped_p" value="no"/>
+    <tag key="mofa" value="no"/>
+    <tag key="moped" value="no"/>
+    <tag key="speed_pedelec" value="no"/>
     <supplementary id="BE:ZONE"/>
   </sign>
@@ -1066,5 +1066,5 @@
     <tag key="maxspeed" value="50"/>
     <tag key="maxspeed:type" value="BE:urban"/>
-	</sign>
+    </sign>
   <sign ref="BE:F1bh"
     name="Start of built-up area / City Limits"
@@ -1073,5 +1073,5 @@
     <tag key="maxspeed" value="50"/>
     <tag key="maxspeed:type" value="BE:urban"/>
-	</sign>
+    </sign>
   <sign ref="BE:F1bv"
     name="Start of built-up area / City Limits"
@@ -1080,9 +1080,9 @@
     <tag key="maxspeed" value="50"/>
     <tag key="maxspeed:type" value="BE:urban"/>
-	</sign>
+    </sign>
   <sign ref="BE:F3a"
     name="End of built-up area / City Limits"
     nl.name="Einde bebouwde kom"
-	fr.name="Fin d'agglomération"
+    fr.name="Fin d'agglomération"
     help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
     <tag key="maxspeed" value="$val_speed"/>
@@ -1100,5 +1100,5 @@
     name="End of built-up area / City Limits"
     nl.name="Einde bebouwde kom"
-	fr.name="Fin d'agglomération"
+    fr.name="Fin d'agglomération"
     help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
     <tag key="maxspeed" value="$val_speed"/>
@@ -1116,5 +1116,5 @@
     name="End of built-up area / City Limits"
     nl.name="Einde bebouwde kom"
-	fr.name="Fin d'agglomération"
+    fr.name="Fin d'agglomération"
     help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
     <tag key="maxspeed" value="$val_speed"/>
@@ -1137,5 +1137,5 @@
     nl.name="Einde zone 30 km/h"
     fr.name="Fin de zone avec vitesse limitée 30 km/h"
-	help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
+    help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
     <tag key="maxspeed" value="$val_speed"/>
       <parameter
@@ -1157,11 +1157,11 @@
         ident="val"
         input="combo"
-		text="link or highway"
-		nl.text="oprit of snelweg"
+        text="link or highway"
+        nl.text="oprit of snelweg"
         default="motorway"
         field_width="13"/>
     <tag key="maxspeed" value="120"/>
-	<tag key="minspeed" value="70"/>
-	<tag key="parking:lane:both" value="no_stopping"/>
+    <tag key="minspeed" value="70"/>
+    <tag key="parking:lane:both" value="no_stopping"/>
   </sign>
   <sign ref="BE:F7"
@@ -1174,5 +1174,5 @@
     wiki="Key:tunnel">
     <tag key="tunnel" value="yes"/>
-	<tag key="layer" value="-1"/>
+    <tag key="layer" value="-1"/>
     <supplementary id="BE:Type_Ia"/> <!--Coming up in x m"-->
     <supplementary id="BE:Type_II"/> <!--Over the following x m"-->
@@ -1181,6 +1181,6 @@
     name="Motorroad"
     nl.name="Autoweg"
-	fr.name="Route pour automobiles"
-	wiki="Key:motorroad"
+    fr.name="Route pour automobiles"
+    wiki="Key:motorroad"
     help="No other tags needed, as the access tags defined on the wiki page should automatically apply. ">
     <tag key="motorroad" value="yes"/>
@@ -1195,7 +1195,7 @@
     wiki="Tag:highway%3Dliving_street">
     <tag key="highway" value="living_street"/>
-	<tag key="foot" value="designated"/>	
+    <tag key="foot" value="designated"/>    
     <tag key="maxspeed" value="20"/>
-	<tag key="maxspeed:type" value="BE:living_street"/>
+    <tag key="maxspeed:type" value="BE:living_street"/>
   </sign>
   <sign ref="BE:F12b"
@@ -1203,17 +1203,17 @@
     nl.name="Einde woonerf"
     wiki="Tag:highway%3Dliving_street"
-	help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
+    help="Unless another sign applies: Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
   </sign>
   <sign ref="BE:F13"
     name="Indicates choice of direction for different lanes at intersection"
-	help="If the way is oneway (for example split up in both directions), the you can add lanes=* and turn:lanes=*">
+    help="If the way is oneway (for example split up in both directions), the you can add lanes=* and turn:lanes=*">
   </sign>
   <sign ref="BE:F14"
-	name="Advanced stop line"
-	nl.name="Opstelvak voor fietsers">
-	<tag key="cycleway" value="asl"/>
+    name="Advanced stop line"
+    nl.name="Opstelvak voor fietsers">
+    <tag key="cycleway" value="asl"/>
   </sign>
   <sign ref="BE:F15"
-	  name="Indicating the direction you're heading to if you follow the lanes below the arrows">
+      name="Indicating the direction you're heading to if you follow the lanes below the arrows">
   </sign>
   <sign ref="BE:F17"
@@ -1242,5 +1242,5 @@
     fr.name="Sens unique"
     wiki="Key:oneway"
-	help="When the direction of the way is the same as the driving direction: oneway=yes. If the oneway restriction is in the opposite direction to the drawn way, the fix in most cases is to turn the way around ('reverse way' tool in the map editors) and apply oneway=yes. If in a (very) rare case, the direction of the way cannot be changed, you can instead tag it as oneway=-1. Also try to always tag oneway:bicycle=no and oneway:mofa=no, depending on the possible exception sign.">
+    help="When the direction of the way is the same as the driving direction: oneway=yes. If the oneway restriction is in the opposite direction to the drawn way, the fix in most cases is to turn the way around ('reverse way' tool in the map editors) and apply oneway=yes. If in a (very) rare case, the direction of the way cannot be changed, you can instead tag it as oneway=-1. Also try to always tag oneway:bicycle=no and oneway:mofa=no, depending on the possible exception sign.">
     <tag key="oneway" value="yes"/>
     <supplementary id="BE:M4"/> <!--not_oneway_for_bicycles-->
@@ -1252,18 +1252,18 @@
   <sign ref="BE:F23a"
     name="N-road number"
-	help="When the motorway has no E-number: ref=N3. When the motorway has an E-number: nat_ref=N3">
+    help="When the motorway has no E-number: ref=N3. When the motorway has an E-number: nat_ref=N3">
   </sign> 
   <sign ref="BE:F23b"
-	name="A-road number (A-road motorway)"
-	help="When the motorway has no E-number: ref=A54. When the motorway has an E-number: nat_ref=A54">
+    name="A-road number (A-road motorway)"
+    help="When the motorway has no E-number: ref=A54. When the motorway has an E-number: nat_ref=A54">
   </sign> 
   <sign ref="BE:F23c"
-	name="E-road number (european motorway)">
-	<tag key="ref" value="E40"/>
-	<tag key="int_ref" value="E40"/>
+    name="E-road number (european motorway)">
+    <tag key="ref" value="E40"/>
+    <tag key="int_ref" value="E40"/>
   </sign> 
   <sign ref="BE:F23d"
-	name="R-road number (ring road)"
-	help="When the motorway has no E-number: ref=R0. When the motorway has an E-number: nat_ref=R0">
+    name="R-road number (ring road)"
+    help="When the motorway has no E-number: ref=R0. When the motorway has an E-number: nat_ref=R0">
   </sign> 
   <sign ref="BE:F45"
@@ -1271,5 +1271,5 @@
     nl.name="Doodlopende straat"
     fr.name="Cul-de-sac"
-	help="Nothing! DO NOT use noexit=yes (see tag description)">
+    help="Nothing! DO NOT use noexit=yes (see tag description)">
     />
   </sign>
@@ -1279,5 +1279,5 @@
     nl.name="Doodlopende straat, behalve voor fietsers"
     fr.name="Cul-de-sac, sauf pour cyclistes"
-	help="Nothing! DO NOT use noexit=yes (see tag description). You can add the correct access tags or highway type on the part of the road where pedestrians and bicycles can pass.">
+    help="Nothing! DO NOT use noexit=yes (see tag description). You can add the correct access tags or highway type on the part of the road where pedestrians and bicycles can pass.">
   </sign>
   <sign ref="BE:F47"
@@ -1289,7 +1289,7 @@
     name="Pedestrian crossing"
     nl.name="Oversteekplaats voor voetgangers"
-	help="Add a node on the highway (it should be a part of the highway!) and tag it.">
+    help="Add a node on the highway (it should be a part of the highway!) and tag it.">
     <tag key="highway" value="crossing"/>
-	<tag key="crossing_ref" value="zebra"/>
+    <tag key="crossing_ref" value="zebra"/>
   </sign>
   <sign ref="BE:F50"
@@ -1305,17 +1305,17 @@
     nl.name="Ondergrondse oversteekplaats voor voetgangers">
     <tag key="highway" value="steps"/>
-	<tag key="bridge" value="yes"/>
+    <tag key="bridge" value="yes"/>
   </sign>
   <sign ref="BE:F51b"
-	name="Elevated crossing underground">
+    name="Elevated crossing underground">
     <tag key="highway" value="steps"/>
-	<tag key="bridge" value="yes"/>
+    <tag key="bridge" value="yes"/>
   </sign>
   <sign ref="BE:F52"
     name="Emergency exit out of tunnel"
     nl.name="Nooduitgang uit tunnel"
-	help="Choose either entrance or exit tag. If necessary, also add the layer= tag">
+    help="Choose either entrance or exit tag. If necessary, also add the layer= tag">
     <tag key="entrance" value="emergency"/>
-	<tag key="exit" value="emergency"/>
+    <tag key="exit" value="emergency"/>
   </sign>
   <sign id="BE:F52bis"
@@ -1323,15 +1323,15 @@
     name="Distance and direction toward emergency exit out of tunnel"
     nl.name="Afstand en richingaanwijzer naar nooduitgang uit tunnel"
-	help="Choose either entrance or exit tag. If necessary, also add the layer= tag">
+    help="Choose either entrance or exit tag. If necessary, also add the layer= tag">
     <tag key="entrance" value="emergency"/>
     <tag key="exit" value="emergency"/>
-	<parameter
+    <parameter
         ident="val"
         type="int"
         input="combo"
-		text="Distance"
-		nl.text="Afstand"
+        text="Distance"
+        nl.text="Afstand"
         suffix="m"
-		default="50"
+        default="50"
         field_width="3"/>
   </sign>
@@ -1339,6 +1339,6 @@
     name="Parking lot"
     wiki="Tag:amenity=parking"
-	nl.name="Parkeerterrein/garage"
-	help="Add a node or area on the place of the parking and tag it">
+    nl.name="Parkeerterrein/garage"
+    help="Add a node or area on the place of the parking and tag it">
     <tag key="amenity" value="parking"/>
   </sign>
@@ -1346,13 +1346,13 @@
     name="Indoor parking lot"
     nl.name="Overdekte parking"
-	wiki="Tag:amenity=parking"
-	help="Add a node or area on the place of the parking and tag it. Choose either multi-storey or underground">
+    wiki="Tag:amenity=parking"
+    help="Add a node or area on the place of the parking and tag it. Choose either multi-storey or underground">
     <tag key="amenity" value="parking"/>
-	<tag key="parking" value="$val"/>
-	<parameter
+    <tag key="parking" value="$val"/>
+    <parameter
         ident="val"
         type="string"
         input="combo"
-		default="underground"/>
+        default="underground"/>
   </sign>
   <sign ref="BE:F87"
@@ -1360,10 +1360,10 @@
     nl.name="Verhoogde inrichting(en), verkeersdrempel"
     wiki="Key:traffic_calming"
-	help="Choose hump / bump / cushion / table. See wiki for more information on the different types of speed bumps.">
+    help="Choose hump / bump / cushion / table. See wiki for more information on the different types of speed bumps.">
     <tag key="traffic_calming" value="$val"/>
-		<parameter
-        ident="val"
-		input="combo"
-		default="bump"/>
+        <parameter
+        ident="val"
+        input="combo"
+        default="bump"/>
   </sign>
   <sign ref="BE:F95"
@@ -1376,9 +1376,9 @@
     name="Access only for pedestrians, speed pedelecs, cyclists and horses"
     nl.name="Enkel voetgangers, fietsers, ruiters en landbouwvoertuigen"
-	help="Variations of this sign exist. Remove the tags that do not appear on the sign">
+    help="Variations of this sign exist. Remove the tags that do not appear on the sign">
     <tag key="access" value="destination"/>
     <tag key="foot" value="yes"/>
-	<tag key="speed_pedelec" value="yes"/>
-	<tag key="bicycle" value="yes"/>
+    <tag key="speed_pedelec" value="yes"/>
+    <tag key="bicycle" value="yes"/>
     <tag key="horse" value="yes"/>
     <tag key="emergency" value="yes"/>
@@ -1390,17 +1390,17 @@
     <tag key="access" value="destination"/>
     <tag key="foot" value="yes"/>
-	<tag key="bicycle" value="yes"/>
+    <tag key="bicycle" value="yes"/>
     <tag key="emergency" value="yes"/>
     <tag key="segregated" value="yes"/>
-	<tag key="maxspeed" value="30"/>
+    <tag key="maxspeed" value="30"/>
   </sign>
   <sign ref="BE:F99c"
     name="Access only for agricultural vehicles, speed pedelecs, pedestrians, horses and cyclists"
-	help="Variations of this sign exist. Remove the tags that do not appear on the sign">	
+    help="Variations of this sign exist. Remove the tags that do not appear on the sign">    
     <tag key="motor_vehicle" value="destination"/>
-	<tag key="agricultural" value="yes"/>
+    <tag key="agricultural" value="yes"/>
     <tag key="speed_pedelec" value="yes"/>
-	<tag key="foot" value="yes"/>
-	<tag key="horse" value="yes"/>
+    <tag key="foot" value="yes"/>
+    <tag key="horse" value="yes"/>
     <tag key="bicycle" value="yes"/>
     <tag key="emergency" value="yes"/>
@@ -1412,34 +1412,34 @@
     wiki="Tag:highway%3Dpedestrian">
     <tag key="highway" value="pedestrian"/>
-	<tag key="vehicle" value="no"/>
-	<tag key="foot" value="designated"/>
-	<tag key="bicycle" value="yes"/>
-	<tag key="emergency" value="yes"/>
-	<tag key="bus" value="yes"/>
+    <tag key="vehicle" value="no"/>
+    <tag key="foot" value="designated"/>
+    <tag key="bicycle" value="yes"/>
+    <tag key="emergency" value="yes"/>
+    <tag key="bus" value="yes"/>
   </sign>
   <sign ref="BE:F111"
     name="Bicycle road"
-	wiki="Key:cyclestreet"
+    wiki="Key:cyclestreet"
     nl.name="Fietsstraat">
     <tag key="bicycle" value="designated"/>
     <tag key="maxspeed" value="30"/>
     <tag key="cyclestreet" value="yes"/>
-	<tag key="overtaking:motor_vehicle" value="no"/>
+    <tag key="overtaking:motor_vehicle" value="no"/>
   </sign>
   <sign ref="BE:F113"
     name="End of Bicycle road"
     nl.name="Einde fietsstraat"
-	wiki=""
-	help="Unless another sign applies: Within built-up area: maxspeed=50, maxspeed:type=BE:urban. Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
+    wiki=""
+    help="Unless another sign applies: Within built-up area: maxspeed=50, maxspeed:type=BE:urban. Outside built-up area in Flanders maxspeed=70, maxspeed:type=BE-VLG:rural. Outside built-up area in Wallonia maxspeed=90, maxspeed:type=BE-WAL:rural. Outside built-up area in Brussels maxspeed=90.">
   </sign>
   <sign ref="BE:F117"
     name="Start of a Low Emission Zone (LEZ)."
-	wiki="Tag:boundary%3Dlow_emission_zone"
-	help="A Low emission zone is defined in OSM by the tag boundary=low_emission_zone. Currently, the ones in Brussels and Antwerp are already tagged. Please see the wiki page before adding any new.">
+    wiki="Tag:boundary%3Dlow_emission_zone"
+    help="A Low emission zone is defined in OSM by the tag boundary=low_emission_zone. Currently, the ones in Brussels and Antwerp are already tagged. Please see the wiki page before adding any new.">
   </sign>
   <sign ref="BE:F118"
     name="End of a Low Emission Zone (LEZ)."
-	wiki="Tag:boundary%3Dlow_emission_zone"
-	help="A Low emission zone is defined in OSM by the tag boundary=low_emission_zone. Currently, the ones in Brussels and Antwerp are already tagged. Please see the wiki page before adding any new.">
+    wiki="Tag:boundary%3Dlow_emission_zone"
+    help="A Low emission zone is defined in OSM by the tag boundary=low_emission_zone. Currently, the ones in Brussels and Antwerp are already tagged. Please see the wiki page before adding any new.">
   </sign>
 
@@ -1458,5 +1458,5 @@
     nl.name="Uitgezonderd fietsers"
     help="Read these instructions carefully!!! Only keep oneway:bicycle=no if used for sign C1, in all other cases remove this tag.
-	bicycle=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    bicycle=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
@@ -1468,5 +1468,5 @@
     nl.name="Uitgezonderd fietsers"
     help="Read these instructions carefully!!! Only keep oneway:bicycle=no if used for sign C1, in all other cases remove this tag.
-	bicycle=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    bicycle=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
@@ -1477,16 +1477,5 @@
     nl.name="Uitgezonderd fietsers en bromfietsers klasse A"
     help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no if used for sign C1, in all other cases remove these two tags.
-	bicycle=yes and mofa=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
-    supplementary="yes">
-    <tag key="bicycle" value="yes"/>
-    <tag key="mofa" value="yes"/>
-	<tag key="oneway:bicycle" value="no"/>
-    <tag key="oneway:mofa" value="no"/>
-  </sign>
-  <sign ref="BE:M3_fr"
-    name="Except for bicycles and mopeds class A"
-    nl.name="Uitgezonderd fietsers en bromfietsers klasse A"
-	help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no if used for sign C1, in all other cases remove these two tags.
-	bicycle=yes and mofa=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    bicycle=yes and mofa=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
@@ -1495,4 +1484,15 @@
     <tag key="oneway:mofa" value="no"/>
   </sign>
+  <sign ref="BE:M3_fr"
+    name="Except for bicycles and mopeds class A"
+    nl.name="Uitgezonderd fietsers en bromfietsers klasse A"
+    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no if used for sign C1, in all other cases remove these two tags.
+    bicycle=yes and mofa=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    supplementary="yes">
+    <tag key="bicycle" value="yes"/>
+    <tag key="mofa" value="yes"/>
+    <tag key="oneway:bicycle" value="no"/>
+    <tag key="oneway:mofa" value="no"/>
+  </sign>
   <sign ref="BE:M4"
     name="Not oneway for bicycles"
@@ -1535,48 +1535,48 @@
     name="Except for bicycles and speedelecs"
     nl.name="Uitgezonderd fietsers en speedelecs"
-    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:moped_p=no if used for sign C1, in all other cases remove these two tags.
-	bicycle=yes and moped_p=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:speed_pedelec=no if used for sign C1, in all other cases remove these two tags.
+    bicycle=yes and speed_pedelec=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
-    <tag key="moped_p" value="yes"/>
-	<tag key="oneway:bicycle" value="no"/>
-    <tag key="oneway:moped_p" value="no"/>
+    <tag key="speed_pedelec" value="yes"/>
+    <tag key="oneway:bicycle" value="no"/>
+    <tag key="oneway:speed_pedelec" value="no"/>
   </sign>
   <sign ref="BE:M11_fr"
     name="Except for bicycles and speedelecs"
     nl.name="Uitgezonderd fietsers en speedelecs"
-    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:moped_p=no if used for sign C1, in all other cases remove these two tags.
-	bicycle=yes and moped_p=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:speed_pedelec=no if used for sign C1, in all other cases remove these two tags.
+    bicycle=yes and speed_pedelec=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
-    <tag key="moped_p" value="yes"/>
+    <tag key="speed_pedelec" value="yes"/>
     <tag key="oneway:bicycle" value="no"/>
-    <tag key="oneway:moped_p" value="no"/>
+    <tag key="oneway:speed_pedelec" value="no"/>
   </sign>
   <sign ref="BE:M12_nl"
     name="Except for bicycles, mopeds class A and speedelecs"
     nl.name="Uitgezonderd fietsers, bromfietsers klasse A en speedelecs"
-    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no oneway:moped_p=no if used for sign C1, in all other cases remove these three tags.
-	bicycle=yes, mofa and moped_p=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no oneway:speed_pedelec=no if used for sign C1, in all other cases remove these three tags.
+    bicycle=yes, mofa and speed_pedelec=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
     <tag key="mofa" value="yes"/>
-	<tag key="moped_p" value="yes"/>
-	<tag key="oneway:bicycle" value="no"/>
+    <tag key="speed_pedelec" value="yes"/>
+    <tag key="oneway:bicycle" value="no"/>
     <tag key="oneway:mofa" value="no"/>
-	<tag key="oneway:moped_p" value="no"/>
+    <tag key="oneway:speed_pedelec" value="no"/>
   </sign>
   <sign ref="BE:M12_fr"
     name="Except for bicycles, mopeds class A and speedelecs"
     nl.name="Uitgezonderd fietsers, bromfietsers klasse A en speedelecs"
-    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no oneway:moped_p=no if used for sign C1, in all other cases remove these three tags.
-	bicycle=yes, mofa and moped_p=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
+    help="Read these instructions carefully!!! Only keep oneway:bicycle=no oneway:mofa=no oneway:speed_pedelec=no if used for sign C1, in all other cases remove these three tags.
+    bicycle=yes, mofa and speed_pedelec=yes is only necessary when the sign is used on a highway=footway, highway=bridleway or highway=pedestrian."
     supplementary="yes">
     <tag key="bicycle" value="yes"/>
     <tag key="mofa" value="yes"/>
-	<tag key="moped_p" value="yes"/>
+    <tag key="speed_pedelec" value="yes"/>
     <tag key="oneway:bicycle" value="no"/>
-	<tag key="oneway:mofa" value="no"/>
-    <tag key="oneway:moped_p" value="no"/>
+    <tag key="oneway:mofa" value="no"/>
+    <tag key="oneway:speed_pedelec" value="no"/>
   </sign>
     
@@ -1654,40 +1654,40 @@
   </sign>  
   <sign ref="BE:Type_IV_local_traffic_nl"
-	name="Except for local traffic"
+    name="Except for local traffic"
     name.nl="Uitgezonderd plaatselijk verkeer"
-	supplementary="yes">
-	<tag key="bicycle" value="yes"/>
-	<tag key="horse" value="yes"/>
-	<tag key="bus" value="yes"/>
-	<tag key="vehicle" value="destination"/>
-	<tag key="emergency" value="yes"/>
+    supplementary="yes">
+    <tag key="bicycle" value="yes"/>
+    <tag key="horse" value="yes"/>
+    <tag key="bus" value="yes"/>
+    <tag key="vehicle" value="destination"/>
+    <tag key="emergency" value="yes"/>
   </sign>
   <sign ref="BE:Type_IV_local_traffic_fr"
-	name="Except for local traffic"
+    name="Except for local traffic"
     name.fr="Excepte circulation locale"
-	supplementary="yes">
-	<tag key="bicycle" value="yes"/>
-	<tag key="horse" value="yes"/>
-	<tag key="bus" value="yes"/>
-	<tag key="vehicle" value="destination"/>
-	<tag key="emergency" value="yes"/>
+    supplementary="yes">
+    <tag key="bicycle" value="yes"/>
+    <tag key="horse" value="yes"/>
+    <tag key="bus" value="yes"/>
+    <tag key="vehicle" value="destination"/>
+    <tag key="emergency" value="yes"/>
   </sign>
 
   <sign ref="BE:Type_IV_residents_nl"
-	name="Except for residents, people owning or renting property along the road"
+    name="Except for residents, people owning or renting property along the road"
     name.nl="Uitgezonderd aangelanden"
-	supplementary="yes">
-	<tag key="horse" value="no"/>
-	<tag key="vehicle" value="destination"/>
-	</sign>
+    supplementary="yes">
+    <tag key="horse" value="no"/>
+    <tag key="vehicle" value="destination"/>
+    </sign>
   <sign ref="BE:Type_IV_residents_exceptions_nl"
-	name="Except for residents, people owning or renting property along the road, permit holder and bicycles"
+    name="Except for residents, people owning or renting property along the road, permit holder and bicycles"
     name.nl="Uitgezonderd aangelanden, toelatingen WZ en rijwielen"
-	supplementary="yes">
-	<tag key="vehicle" value="destination"/>
-	<tag key="horse" value="destination"/>
-	<tag key="bicycle" value="yes"/>
-	<tag key="vehicle:conditional" value="yes @ permit" />	
-	<tag key="horse:conditional" value="yes @ permit" />	
+    supplementary="yes">
+    <tag key="vehicle" value="destination"/>
+    <tag key="horse" value="destination"/>
+    <tag key="bicycle" value="yes"/>
+    <tag key="vehicle:conditional" value="yes @ permit" />    
+    <tag key="horse:conditional" value="yes @ permit" />    
   </sign>
     
@@ -1737,10 +1737,10 @@
     name="Max weight indication"
     nl.name="Specificatie van maximum toegelaten">
-	<tag tag_ref="hgv_weight_access" condition="conditional"/>
-	<tag tag_ref="hgv_weight_access" append_value="no @ (weight>$val_weight)"/>
-	<tag tag_ref="goods_weight_access" condition="conditional"/>
-	<tag tag_ref="goods_weight_access" append_value="no @ (weight>$val_weight)"/>
-	<tag tag_ref="weight_speed" condition="conditional"/>
-	<tag tag_ref="weight_speed" append_value="$val_speed @ (weight>$val_weight)"/>
+    <tag tag_ref="hgv_weight_access" condition="conditional"/>
+    <tag tag_ref="hgv_weight_access" append_value="no @ (weight>$val_weight)"/>
+    <tag tag_ref="goods_weight_access" condition="conditional"/>
+    <tag tag_ref="goods_weight_access" append_value="no @ (weight>$val_weight)"/>
+    <tag tag_ref="weight_speed" condition="conditional"/>
+    <tag tag_ref="weight_speed" append_value="$val_speed @ (weight>$val_weight)"/>
       <parameter
         ident="val_weight"