Bugs fixed in map_route()