Fix queue issues in manage, allowing accurate reporting of status