Improve the queue reset