Index: navit/track.c
===================================================================
--- navit/track.c	(revision 4640)
+++ navit/track.c	(working copy)
@@ -648,10 +648,12 @@
 		return;
 	if (!vehicle_get_attr(tr->vehicle, attr_position_valid, &valid, NULL))
 		valid.u.num=attr_position_valid_valid;
+#if 0
 	if (valid.u.num == attr_position_valid_invalid) {
 		tr->valid=valid.u.num;
 		return;
 	}
+#endif
 	if (!vehicle_get_attr(tr->vehicle, attr_position_speed, &speed_attr, NULL) ||
 	    !vehicle_get_attr(tr->vehicle, attr_position_direction, &direction_attr, NULL) ||
 	    !vehicle_get_attr(tr->vehicle, attr_position_coord_geo, &coord_geo, NULL) ||

Index: navit/maptool/osm.c
===================================================================
--- navit/maptool/osm.c	(revision 4640)
+++ navit/maptool/osm.c	(working copy)
@@ -1055,6 +1055,9 @@
 		flags[access_value(v)] |= AF_DANGEROUS_GOODS;
 		level=5;
 	}
+	if (! strcmp(k,"tunnel") && ! strcmp(v,"1")) {
+                  flags[0] |= AF_UNDERGROUND;
+        }
 	if (! strcmp(k,"note"))
 		level=5;
 	if (! strcmp(k,"name")) {