Fix command line interface
Transfer extending_for queue to new next hops