updated to handle lists for users and queues