Changed handling of person names