Added filtering by queue_id