Fixed URL decoding issue for URL's with parameters