Tagged fill-and-finish