better handling of comma-separated queues