Finish build_route() fixing