Use CGI escape instead of URI encode