Removed some aggressive URL encodings