More PG fix
S3OptionsFilter

merged