Don't include canceled queues, refactoring