URL Encoder fix