Fixing url encoding support for S3