Switched CGI.escape to URI.escape to resolve Spaces sent with +