Improve the performance of grouped cancel/requeue