Use URI::escape instead of CGI