Tweaks to queue routing behavior
Remove notify_listeners jobs