Clean up calling for URL to be a simple Naïve string matching, also
pushed to CrHandler so that it can easily be changed