queue_route refactor