Scraping logic change

Scraping logic change