Adding in qnaire-specific queue management