update normalize_uri calls