fixed URL Encoding problem