update NPO scraper and mapping