diff --git a/misc/profiles2/lookups.dat b/misc/profiles2/lookups.dat
index 626dc8d..96ee630 100644
--- a/misc/profiles2/lookups.dat
+++ b/misc/profiles2/lookups.dat
@@ -1,281 +1,467 @@
 ---lookupversion:10
+---minorversion:1
 ---readvarlength
 
 ---context:way
 
-highway;0001731794 track
-highway;0001457935 residential
-highway;0000968516 service
-highway;0000756237 footway
-highway;0000521566 path
-highway;0000261772 unclassified
-highway;0000220315 secondary
-highway;0000207585 tertiary
-highway;0000103445 steps
-highway;0000102114 primary
-highway;0000094484 cycleway
-highway;0000090388 living_street
-highway;0000035041 motorway
-highway;0000029965 pedestrian
-highway;0000026875 motorway_link
-highway;0000015054 trunk
-highway;0000014604 primary_link
-highway;0000012211 road
-highway;0000011822 trunk_link
-highway;0000005882 construction
-highway;0000005425 bridleway
-highway;0000005180 secondary_link
-highway;0000003360 platform
-highway;0000002616 proposed abandoned
-highway;0000001374 tertiary_link
-highway;0000000760 ferry
-highway;0000000541 raceway
-highway;0000000346 rest_area
-highway;0000000300 bus_stop
-highway;0000000184 services
+highway;0029035962 residential
+highway;0010319731 service
+highway;0007688809 track
+highway;0007656124 unclassified
+highway;0004141444 footway
+highway;0003493551 tertiary
+highway;0002852601 path
+highway;0002185240 secondary
+highway;0001447719 primary
+highway;0000699577 cycleway
+highway;0000608469 trunk
+highway;0000568118 living_street
+highway;0000515044 motorway
+highway;0000451760 motorway_link
+highway;0000442502 steps
+highway;0000360177 road
+highway;0000318426 pedestrian
+highway;0000210535 trunk_link
+highway;0000192461 primary_link
+highway;0000120758 secondary_link
+highway;0000079637 tertiary_link
+highway;0000070238 construction
+highway;0000058257 bridleway
+highway;0000039003 platform
+highway;0000037192 proposed
+highway;0000010307 raceway
+highway;0000008949 ferry
+highway;0000003152 rest_area
+highway;0000002942 abandoned
+highway;0000002631 services
+highway;0000002133 corridor
+highway;0000002093 crossing
+highway;0000001440 bus_stop
 
-tracktype;0000356503 grade2
-tracktype;0000353482 grade3
-tracktype;0000281625 grade1
-tracktype;0000245193 grade4
-tracktype;0000179135 grade5
+tracktype;0000887965 grade2
+tracktype;0000868414 grade3
+tracktype;0000595882 grade1
+tracktype;0000568372 grade4
+tracktype;0000405959 grade5
 
-surface;0000363915 asphalt
-surface;0000303589 paved
-surface;0000196783 gravel
-surface;0000137371 ground
-surface;0000128215 grass
-surface;0000092748 unpaved
-surface;0000086579 paving_stones
-surface;0000066111 cobblestone
-surface;0000042061 dirt
-surface;0000026551 concrete
-surface;0000025631 compacted
-surface;0000019861 sand
-surface;0000009400 pebblestone
-surface;0000003197 fine_gravel
+surface;0002497676 asphalt
+surface;0001568957 paved
+surface;0001562253 unpaved
+surface;0000727427 gravel
+surface;0000560191 ground
+surface;0000350378 dirt
+surface;0000237226 grass
+surface;0000212587 concrete
+surface;0000188743 paving_stones
+surface;0000113800 cobblestone
+surface;0000093164 compacted
+surface;0000091171 sand
+surface;0000023293 wood
+surface;0000019915 pebblestone
+surface;0000012866 fine_gravel
+surface;0000010681 earth
 
-maxspeed;0000402224 30
-maxspeed;0000224685 50
-maxspeed;0000045177 100
-maxspeed;0000037529 70
-maxspeed;0000014237 none
-maxspeed;0000014022 60
-maxspeed;0000011530 80
-maxspeed;0000009951 10
-maxspeed;0000008056 20
-maxspeed;0000005772 120
-maxspeed;0000003165 40
-maxspeed;0000002987 7
-maxspeed;0000002826 signals
-maxspeed;0000001933 130
+maxspeed;0001058313 50 30_mph 30mph
+maxspeed;0000860780 30 20_mph 20mph
+maxspeed;0000025232 10 5 7 15
+maxspeed;0000083989 20 10_mph 10mph 15_mph 15mph
+maxspeed;0000195097 40 45 25_mph 25mph
+maxspeed;0000204646 60 35_mph 35mph 40_mph 40mph
+maxspeed;0000130108 70 45_mph 45mph
+maxspeed;0000225071 80 50_mph 50mph
+maxspeed;0000106719 90 55_mph 55mph
+maxspeed;0000134522 100 60_mph 60mph 65_mph 65mph
+maxspeed;0000025242 110 70_mph 70mph
+maxspeed;0000038763 120 75_mph 75mph
+maxspeed;0000026953 130
+maxspeed;0000138654 urban RO:urban RU:urban FR:urban IT:urban AT:urban DE:urban UA:urban
+maxspeed;0000138654 rural RO:rural RU:rural FR:rural IT:rural AT:rural DE:rural UA:rural
 
-service;0000221481 parking_aisle
-service;0000157110 driveway
+service;0001433919 parking_aisle
+service;0001305879 driveway
+service;0000382788 alley
+service;0000018777 drive-through drive_through
+service;0000008290 emergency_access
+service;0000003138 bus
+service;0000001250 parking
+service;0000001159 logging
 
-lit;0000132495 yes
+lit;0000809223 yes
 
-lanes;0000098207 2
-lanes;0000042192 1
-lanes;0000018533 3
-lanes;0000004577 4
-lanes;0000000448 5
-lanes;0000000318 1.5
+lanes;0002838405 2
+lanes;0000718138 1
+lanes;0000259502 3
+lanes;0000141651 4
+lanes;0000018473 -1
+lanes;0000017934 5
+lanes;0000008241 6
+lanes;0000003643 1.5
+lanes;0000001087 7
 
-access;0000044859 yes permissive
-access;0000008452 designated official
-access;0000028727 destination customers
-access;0000076985 agricultural forestry
-access;0000116270 private
-access;0000028044 no
+access;0002688349 private
+access;0000319927 yes
+access;0000144799 no
+access;0000140215 permissive
+access;0000108802 destination
+access;0000099899 agricultural forestry
+access;0000039934 designated official
+access;0000011813 customers
+access;0000004007 delivery
 
-foot;0000339384 yes allowed Yes
-foot;0000125339 designated official
-foot;0000018945 no
-foot;0000001562 private
-foot;0000000279 destination
-foot;0000008172 permissive
+foot;0001659694 yes allowed Yes
+foot;0000424847 designated official
+foot;0000202364 no
+foot;0000053031 permissive
+foot;0000011661 destination
+foot;0000007289 private
+foot;0000000167 use_sidepath sidewalk
 
-bicycle;0000302789 yes allowed permissive 
-bicycle;0000108056 designated official
-bicycle;0000000265 destination
-bicycle;0000003593 dismount
-bicycle;0000001426 private
-bicycle;0000070179 no
+bicycle;0001245560 yes allowed
+bicycle;0000452059 no
+bicycle;0000324902 designated official
+bicycle;0000025707 dismount
+bicycle;0000020440 permissive
+bicycle;0000008286 private
+bicycle;0000001553 destination
+bicycle;0000000719 use_sidepath use_cycleway
+bicycle;0000000385 mtb
+bicycle;0000000117 opposite
 
-motorcar;0000010111 yes permissive
-motorcar;0000001537 designated official
-motorcar;0000007102 destination
-motorcar;0000016706 agricultural forestry agriculture
-motorcar;0000002178 private
-motorcar;0000077771 no
+motorcar;0000135124 no
+motorcar;0000045407 yes
+motorcar;0000021494 agricultural forestry
+motorcar;0000012090 destination
+motorcar;0000008733 private
+motorcar;0000005757 designated official
+motorcar;0000004116 permissive
+motorcar;0000000979 restricted
 
-motor_vehicle;0000013813 yes permissive
-motor_vehicle;0000002098 designated official
-motor_vehicle;0000009792 destination
-motor_vehicle;0000019301 agricultural forestry
-motor_vehicle;0000006563 private
-motor_vehicle;0000025491 no
+motor_vehicle;0000212692 no
+motor_vehicle;0000184982 yes
+motor_vehicle;0000045128 private
+motor_vehicle;0000032622 agricultural forestry agricultural;forestry agricultural,forestry
+motor_vehicle;0000025396 designated official
+motor_vehicle;0000025092 destination
+motor_vehicle;0000010895 permissive
+motor_vehicle;0000000175 emergency
 
-motorcycle;0000005750 yes permissive
-motorcycle;0000001158 designated official
-motorcycle;0000005805 destination
-motorcycle;0000012401 agricultural forestry
-motorcycle;0000001180 private
-motorcycle;0000053955 no
+motorcycle;0000092079 no
+motorcycle;0000027978 yes
+motorcycle;0000014652 agricultural forestry
+motorcycle;0000008862 destination
+motorcycle;0000004877 designated official
+motorcycle;0000003936 private
+motorcycle;0000002209 permissive
 
-vehicle;0000000505 yes permissive
-vehicle;0000000027 designated
-vehicle;0000007582 destination
-vehicle;0000004357 agricultural forestry
-vehicle;0000001155 private
-vehicle;0000006487 no
+vehicle;0000030218 no
+vehicle;0000013333 destination
+vehicle;0000011692 yes
+vehicle;0000007147 agricultural forestry agricultural;forestry
+vehicle;0000006305 private
+vehicle;0000001294 permissive
+vehicle;0000000105 designated
 
-cycleway;0000033575 track
-cycleway;0000012829 no
-cycleway;0000011604 lane
-cycleway;0000008938 opposite
-cycleway;0000001503 none
-cycleway;0000001146 right
-cycleway;0000001031 opposite_track
-cycleway;0000001029 yes
-cycleway;0000000856 opposite_lane
-cycleway;0000000675 both
-cycleway;0000000665 left
-cycleway;0000000521 shared
-cycleway;0000000383 street
-cycleway;0000000176 segregated
+horse;0000227398 no
+horse;0000144432 yes
+horse;0000014566 designated
+horse;0000007223 permissive
+horse;0000004755 private
+horse;0000000983 official
+horse;0000000968 unknown
+horse;0000000205 destination
 
-mtb:scale;0000043968 0
-mtb:scale;0000019705 1
-mtb:scale;0000006436 2
-mtb:scale;0000002702 3
-mtb:scale;0000001083 4
-mtb:scale;0000000329 5
+wheelchair;0000036603 no
+wheelchair;0000028451 yes
+wheelchair;0000002713 limited
+wheelchair;0000001043 unknown
+wheelchair;0000000439 designated official
+wheelchair;0000000184 destination
 
-sac_scale;0000049626 hiking
-sac_scale;0000007933 mountain_hiking
-sac_scale;0000001160 demanding_mountain_hiking
-sac_scale;0000000523 yes
-sac_scale;0000000364 alpine_hiking
-sac_scale;0000000117 demanding_alpine_hiking
+hgv;0000206836 designated
+hgv;0000071222 yes
+hgv;0000043783 no
+hgv;0000019115 destination
+hgv;0000005273 delivery
+hgv;0000003055 local
+hgv;0000001088 agricultural forestry
+hgv;0000000461 private
+hgv;0000000320 unsuitable
+hgv;0000000306 permissive
 
-noexit;0000058492 yes
+cycleway;0000137526 no
+cycleway;0000124777 lane
+cycleway;0000106948 track
+cycleway;0000044652 opposite
+cycleway;0000011237 shared
+cycleway;0000007312 opposite_lane
+cycleway;0000005737 shared_lane
+cycleway;0000002533 yes
+cycleway;0000002356 opposite_track
+cycleway;0000001945 share_busway
+cycleway;0000001883 none
+cycleway;0000001705 crossing
+cycleway;0000001560 unmarked_lane
+cycleway;0000001542 right
+cycleway;0000001291 segregated
+cycleway;0000001065 both
+cycleway;0000000892 left
+cycleway;0000000399 street
+cycleway;0000000344 shoulder
+cycleway;0000000326 designated
+cycleway;0000000247 proposed
+cycleway;0000000224 cyclestreet
+cycleway;0000000172 path
+cycleway;0000000154 sidewalk
 
-motorroad;0000019250 yes
+segregated;0000224960 no
+segregated;0000051124 yes
 
-oneway;0000330245 yes
-oneway;0000075148 no
-oneway;0000003679 -1
-oneway;0000000001 true
-oneway;0000000001 1
+mtb:scale;0000114272 0
+mtb:scale;0000068284 1
+mtb:scale;0000027311 2
+mtb:scale;0000011529 3
+mtb:scale;0000003666 4
+mtb:scale;0000001957 0+
+mtb:scale;0000001472 5
+mtb:scale;0000000498 1+
+mtb:scale;0000000478 1-
+mtb:scale;0000000268 0-
+mtb:scale;0000000177 2-
+mtb:scale;0000000131 2+
+mtb:scale;0000000115 6
 
-junction;0000015929 roundabout
+sac_scale;0000150704 hiking
+sac_scale;0000070463 mountain_hiking
+sac_scale;0000010993 demanding_mountain_hiking
+sac_scale;0000004549 alpine_hiking
+sac_scale;0000001620 demanding_alpine_hiking
+sac_scale;0000000831 yes
+sac_scale;0000000712 difficult_alpine_hiking
+sac_scale;0000000265 T1-hiking
 
-bridge;0000182649 yes viaduct true suspension
+noexit;0000118665 yes
 
-tunnel;0000031626 yes
+motorroad;0000056844 yes
 
-lcn;0000018999 yes
+oneway;0005387257 yes
+oneway;0001455407 no
+oneway;0000139188 -1
+oneway;0000000892 reversible
+oneway;0000000756 1
+oneway;0000000481 true
 
-longdistancecycleway;0000000001 yes
+junction;0000321066 roundabout
+junction;0000002828 spui
+junction;0000002134 jughandle
+junction;0000001493 approach
 
-route_bicycle_icn;0000000001 yes
-route_bicycle_ncn;0000000001 yes
-route_bicycle_rcn;0000000001 yes
-route_bicycle_lcn;0000000001 yes
-route_bicycle_all;0000000001 yes
+bridge;0001842517 yes viaduct true suspension
+
+tunnel;0000247305 yes
+tunnel;0000016890 building_passage
+tunnel;0000004237 no
+tunnel;0000000265 passage
+tunnel;0000000241 culvert
+tunnel;0000000122 avalanche_protector
+tunnel;0000000114 covered
+
+lcn;0000073956 yes
+lcn;0000002631 proposed
+
+oneway:bicycle;0000012034 no
+oneway:bicycle;0000005217 yes
+oneway:bicycle;0000000161 opposite
+
+incline;0000052784 up
+incline;0000035413 down
+incline;0000001628 yes
+incline;0000000779 steep
+incline;0000000861 3% 0 1 2 3 0% 1% 2% 3%
+incline;0000000724 5% 4 5 4%
+incline;0000000530 8% 6 7 8 6% 7%
+incline;0000003109 10% 9 10 9% 10°
+incline;0000001297 15% 11 12 13 14 15 11% 12% 13% 14%
+incline;0000000997 20% 16 17 18 19 20 16% 17% 18% 19%
+incline;0000000409 25% 21 22 23 24 25 21% 22% 23% 24%
+incline;0000000263 30% 30 40 50 40% 50%
+incline;0000000861 -3% -1 -2 -3 -1% -2% -3%
+incline;0000000724 -5% -4 -5 -4%
+incline;0000000530 -8% -6 -7 -8 -6% -7%
+incline;0000001515 -10% -9 -10 -9% -10°
+incline;0000001297 -15% -11 -12 -13 -14 -15 -11% -12% -13% -14%
+incline;0000000997 -20% -16 -17 -18 -19 -20 -16% -17% -18% -19%
+incline;0000000409 -25% -21 -22 -23 -24 -25 -21% -22% -23% -24%
+incline;0000000172 -30% -30 -40 -50 -40% -50%
+
+toll;0000090536 yes true
+
+brouter_placeholder_dummy_01;0000000001 dummy
+brouter_placeholder_dummy_02;0000000001 dummy
+brouter_placeholder_dummy_03;0000000001 dummy
+brouter_placeholder_dummy_04;0000000001 dummy
+brouter_placeholder_dummy_05;0000000001 dummy
+brouter_placeholder_dummy_06;0000000001 dummy
+brouter_placeholder_dummy_07;0000000001 dummy
+brouter_placeholder_dummy_08;0000000001 dummy
+  
+route_bicycle_icn;0000088753 yes
+route_bicycle_ncn;0000268180 yes
+route_bicycle_rcn;0000718163 yes
+route_bicycle_lcn;0000469215 yes
+route_bicycle_;0000024662 yes
+route_bicycle_radweit;0000004604 yes
+
+route_hiking_iwn;0000056005 yes
+route_hiking_nwn;0000315813 yes
+route_hiking_rwn;0000343219 yes
+route_hiking_lwn;0000359332 yes
+route_hiking_;0000103733 yes
+
+route_foot_nwn;0000047923 yes
+route_foot_lwn;0000135371 yes
+route_foot_rwn;0000115325 yes
+route_foot_;0000070583 yes
+
+route_mtb_;0000066263 yes
+route_mtb_lcn;0000023718 yes
+route_mtb_ncn;0000004853 yes
+route_mtb_rcn;0000013321 yes
+route_mtb_mtb;0000006853 yes
+route_bicycle_mtb;0000002240 yes
 
 ---context:node
 
-highway;0000100947 turning_circle
-highway;0000067645 traffic_signals
-highway;0000047209 crossing
-highway;0000037164 bus_stop
-highway;0000006577 motorway_junction
-highway;0000003811 stop
-highway;0000002331 mini_roundabout
-highway;0000001789 milestone
-highway;0000001692 passing_place
-highway;0000001289 give_way
-highway;0000001092 emergency_access_point
-highway;0000000683 speed_camera
-highway;0000000672 steps
-highway;0000000658 incline_steep
-highway;0000000620 elevator
-highway;0000000506 street_lamp
-highway;0000000490 ford
-highway;0000000458 incline
-highway;0000000135 rest_area
-highway;0000000105 path
-highway;0000000098 emergency_bay
-highway;0000000096 road
-highway;0000000087 platform
-highway;0000000074 services
-highway;0000000058 track
-highway;0000000055 service
-highway;0000000054 footway
-highway;0000000053 traffic_calming
+highway;0001314954 bus_stop
+highway;0001130090 crossing
+highway;0001031274 turning_circle
+highway;0000609262 traffic_signals
+highway;0000306900 street_lamp
+highway;0000136339 stop
+highway;0000105097 motorway_junction
+highway;0000058076 give_way
+highway;0000049111 mini_roundabout
+highway;0000030072 milestone
+highway;0000017567 speed_camera
+highway;0000013806 emergency_access_point
+highway;0000009721 platform
+highway;0000007369 passing_place
+highway;0000005939 ford
+highway;0000004831 rest_area
+highway;0000003535 elevator
+highway;0000002572 turning_loop
+highway;0000002540 steps
+highway;0000002493 services
+highway;0000002133 emergency_bay
+highway;0000001372 residential
+highway;0000001324 street_light
+highway;0000001147 incline_steep
+highway;0000001101 stile
+highway;0000000904 incline
+highway;0000000819 service
+highway;0000000817 traffic_calming
+highway;0000000662 path
+highway;0000000603 footway
+highway;0000000438 track
+highway;0000000436 no
+highway;0000000353 door
+highway;0000000283 level_crossing
+highway;0000000267 yes
+highway;0000000262 road
+highway;0000000244 construction
+highway;0000000214 unclassified
+highway;0000000213 proposed
+highway;0000000197 junction
+highway;0000000176 distance_marker
+highway;0000000158 noexit
+highway;0000000155 unknown
+highway;0000000134 traffic_sign
+highway;0000000123 tertiary
+highway;0000000115 trailhead
+highway;0000000113 priority_to_right
+highway;0000000113 culvert
+highway;0000000100 <residential>
 highway;0000000046 toll_bridge
 highway;0000000037 city_entry
 
-barrier;0000076979 gate
-barrier;0000069308 bollard
-barrier;0000028131 lift_gate
-barrier;0000017332 cycle_barrier
-barrier;0000005693 entrance
-barrier;0000002885 block
-barrier;0000001065 kissing_gate
-barrier;0000000828 cattle_grid
-barrier;0000000602 stile
-barrier;0000000561 turnstile
-barrier;0000000512 no
-barrier;0000000463 fence
-barrier;0000000417 bump_gate
-barrier;0000000324 sally_port
-barrier;0000000283 yes
-barrier;0000000283 hampshire_gate
-barrier;0000000236 swing_gate
-barrier;0000000203 chain
-barrier;0000000181 toll_booth
-barrier;0000000180 door
-barrier;0000000104 chicane
-barrier;0000000096 tree
-barrier;0000000087 border_control
-barrier;0000000077 log
-barrier;0000000076 traffic_crossing_pole
-barrier;0000000063 wall
-barrier;0000000060 fallen_tree
-barrier;0000000052 stone
-barrier;0000000048 ditch
-barrier;0000000031 spikes
+barrier;0000606512 gate
+barrier;0000164120 bollard
+barrier;0000112184 lift_gate
+barrier;0000046779 stile
+barrier;0000046255 cycle_barrier
+barrier;0000038597 entrance
+barrier;0000027579 block
+barrier;0000023074 toll_booth
+barrier;0000016782 cattle_grid
+barrier;0000016154 kissing_gate
+barrier;0000003182 turnstile
+barrier;0000003160 fence
+barrier;0000002701 border_control
+barrier;0000002536 sally_port
+barrier;0000002504 chain
+barrier;0000002470 door
+barrier;0000002089 swing_gate
+barrier;0000001912 bump_gate
+barrier;0000001856 yes
+barrier;0000001683 hampshire_gate
+barrier;0000000445 wall
+barrier;0000000440 bus_trap
+barrier;0000000435 ditch
+barrier;0000000420 debris
+barrier;0000000381 log
+barrier;0000000336 chicane
+barrier;0000000316 kerb
+barrier;0000000270 sump_buster
+barrier;0000000268 obstacle
+barrier;0000000223 no
+barrier;0000000213 horse_stile
+barrier;0000000210 full-height_turnstile
+barrier;0000000176 windfall
+barrier;0000000168 spikes
+barrier;0000000168 checkpoint
+barrier;0000000166 hedge
+barrier;0000000164 footgate
+barrier;0000000141 tree
+barrier;0000000133 guard_rail
+barrier;0000000129 bar
+barrier;0000000124 fallen_tree
+barrier;0000000118 jersey_barrier
+barrier;0000000114 motorcycle_barrier
+barrier;0000000114 barrier
+barrier;0000000108 rope
+barrier;0000000095 stone
+barrier;0000000069 traffic_crossing_pole
 
-access;0000001309 yes permissive
-access;0000000118 designated official
-access;0000000405 destination customers
-access;0000000276 agricultural forestry
-access;0000008574 private
-access;0000002145 no
 
-foot;0000080681 yes permissive
-foot;0000000326 designated official
-foot;0000000023 destination
-foot;0000000156 private
-foot;0000009170 no
+access;0000078544 private
+access;0000014933 yes public
+access;0000014456 no
+access;0000008670 permissive
+access;0000006316 destination customers
+access;0000000973 agricultural forestry
+access;0000000942 designated official
 
-bicycle;0000076717 yes permissive
-bicycle;0000000406 designated official
-bicycle;0000000018 destination
-bicycle;0000000081 dismount
-bicycle;0000000051 private
-bicycle;0000016121 no
+foot;0000272169 yes
+foot;0000036271 no
+foot;0000001118 designated official
+foot;0000000960 private
+foot;0000000833 permissive
+foot;0000000127 destination
 
-motorcar;0000005785 yes permissive
-motorcar;0000000026 designated official
-motorcar;0000000080 destination
-motorcar;0000000112 agricultural forestry
-motorcar;0000000171 private
-motorcar;0000001817 no
+bicycle;0000267569 yes
+bicycle;0000067796 no
+bicycle;0000004075 designated official
+bicycle;0000002596 dismount
+bicycle;0000000498 permissive
+bicycle;0000000359 private
+bicycle;0000000075 destination
+
+motorcar;0000038901 yes
+motorcar;0000009323 no
+motorcar;0000000895 private
+motorcar;0000000216 destination
+motorcar;0000000214 permissive
+motorcar;0000000093 agricultural forestry
+motorcar;0000000084 designated official
 
 motor_vehicle;0000000066 yes permissive
 motor_vehicle;0000000000 designated official
@@ -284,39 +470,80 @@ motor_vehicle;0000000073 agricultural forestry
 motor_vehicle;0000000136 private
 motor_vehicle;0000000469 no
 
-motorcycle;0000004515 yes permissive
-motorcycle;0000000007 designated official
-motorcycle;0000000054 destination
-motorcycle;0000000027 agricultural forestry
-motorcycle;0000000063 private
-motorcycle;0000001637 no
+motorcycle;0000028697 yes
+motorcycle;0000007061 no
+motorcycle;0000000243 private
+motorcycle;0000000237 designated 
+motorcycle;0000000117 destination
+motorcycle;0000000080 permissive
+motorcycle;0000000029 agricultural forestry
 
-vehicle;0000000058 yes permissive
-vehicle;0000000000 designated
-vehicle;0000000081 destination
-vehicle;0000000038 agricultural forestry
-vehicle;0000000041 private
-vehicle;0000000271 no
+vehicle;0000002176 no
+vehicle;0000000576 yes
+vehicle;0000000556 private
+vehicle;0000000262 destination
+vehicle;0000000138 agricultural forestry
+vehicle;0000000105 permissive
+vehicle;0000000003 designated official
 
-crossing;0000032485 traffic_signals
-crossing;0000014300 uncontrolled
-crossing;0000005086 island
-crossing;0000001565 unmarked
-crossing;0000001066 no
-crossing;0000000333 zebra
+horse;0000021837 yes
+horse;0000010811 no
+horse;0000000105 private
+horse;0000000065 permissive
+horse;0000000053 designated official
+horse;0000000009 critical
+horse;0000000007 destination
+  
+wheelchair;0000203478 yes true
+wheelchair;0000100082 no false
+wheelchair;0000080430 limited
+wheelchair;0000002769 designated official
+wheelchair;0000000005 private
+wheelchair;0000000005 permissive
+wheelchair;0000000139 bad
+wheelchair;0000000031 half
+wheelchair;0000000005 partial
 
-railway;0000034039 level_crossing
-railway;0000010175 crossing
+hgv;0000001141 no
+hgv;0000000359 yes true
+hgv;0000000111 destination
+hgv;0000000108 designated official
+hgv;0000000065 private
+hgv;0000000053 delivery
+hgv;0000000016 agricultural forestry
+hgv;0000000010 permissive
 
-noexit;0000043010 yes
+crossing;0000251032 uncontrolled
+crossing;0000200387 traffic_signals
+crossing;0000029717 unmarked
+crossing;0000022119 island
+crossing;0000006981 zebra
+crossing;0000003897 no
+crossing;0000002166 yes
 
-entrance;0000015094 yes
-entrance;0000007079 main
-entrance;0000000554 service
-entrance;0000000169 emergency
-entrance;0000000063 exit
-entrance;0000000008 private
+railway;0000312710 level_crossing
+railway;0000078746 station
+railway;0000067876 buffer_stop
+railway;0000056184 switch
+railway;0000049600 crossing
+railway;0000037871 tram_stop
+railway;0000024038 halt
+railway;0000014285 subway_entrance
+railway;0000010890 signal
 
-lcn;0000018999 yes
+noexit;0000195286 yes
 
-longdistancecycleway;0000000001 yes
+entrance;0000301732 yes
+entrance;0000159853 main
+entrance;0000025621 staircase
+entrance;0000006666 home
+entrance;0000005428 service
+entrance;0000001853 emergency
+entrance;0000001144 exit
+entrance;0000000953 residence
+entrance;0000000620 garage
+entrance;0000000558 entrance
+entrance;0000000504 main_entrance
+entrance;0000000439 secondary_entrance
+entrance;0000000285 shop
+entrance;0000000258 private
diff --git a/misc/profiles2/trekking.brf b/misc/profiles2/trekking.brf
index 28a59ec..76982c1 100644
--- a/misc/profiles2/trekking.brf
+++ b/misc/profiles2/trekking.brf
@@ -29,7 +29,11 @@ assign uphillcutoff 1.5
 #
 # pre-calculate some logical expressions
 #
-assign is_ldcr and longdistancecycleway=yes not ignore_cycleroutes
+
+assign any_cycleroute or route_bicycle_icn=yes or route_bicycle_ncn=yes or route_bicycle_rcn=yes route_bicycle_lcn=yes
+assign nodeaccessgranted or any_cycleroute lcn=yes
+
+assign is_ldcr and any_cycleroute not ignore_cycleroutes
 assign isbike or bicycle=yes or bicycle=designated lcn=yes
 assign ispaved or surface=paved or surface=asphalt or surface=concrete surface=paving_stones
 assign isunpaved not or surface= or ispaved or surface=fine_gravel surface=cobblestone
@@ -66,7 +70,7 @@ assign defaultaccess
 # calculate logical bike access
 #
 assign bikeaccess
-       or longdistancecycleway=yes
+       or any_cycleroute
           switch bicycle=
                  switch vehicle=
                         defaultaccess
@@ -128,7 +132,7 @@ assign costfactor
 
   #
   # steps and ferries are special. Note this is handled
-  # before the longdistancecycleway-switch, to be able
+  # before the cycleroute-switch, to be able
   # to really exlude them be setting cost to infinity 
   #
   switch    highway=steps  switch allow_steps   40 100000
@@ -198,7 +202,7 @@ assign defaultaccess
                      1
 
 assign bikeaccess
-       or or longdistancecycleway=yes lcn=yes
+       or nodeaccessgranted=yes
           switch bicycle=
                  switch vehicle=
                         defaultaccess