Fixes for multiple group directory/queues