Start migration S3OptionsFilter=>filterOptionsS3, bug fix