Fixed fetching queues was still using the outdated logic