Fixed additional cases to accept uris with non-utf-8