move the extraction of triggered batches a bit around