Fix: batch-queue management improved.