more fixes to scraper