Final logical changes on route search