Fix comma separated queues