More filterOptionsS3 migration