scraper fixes
scraper fixes


Former-commit-id: 7c09d22a257167842febb35ef0a1605548e871c2