Updated UrlCanonicalizer to work on most of the URLs. Edge cases may
still be pending.