Added modifications to work with CGI.escaped spaces in category names