More work on batch-tagging