Updates for batches allowing returns and new types of quals