Use normalize_uri a little better