Improved the route matching and fixed the route assembly