scraper fixes
scraper fixes


Former-commit-id: 7dbe6fcea0360db2b17d5c5e4a34f632e3fb3e06