ABC - Update NormalizeURL to rewrite old URLs.