Some refinement to the route search