S3LocationFilter: Ensure that any default options are included in the list
of available options