Added queue, removed old grouped listing