Adds bucket_with_key to deal with weird s3 encoding issue