Improved NormalizeUrl() (now works with more URL's).