Scraping improvements