Switch from CGI.escape to URI.escape due to improper handling of space e...

...scapes