[backport] fixed: scraper fallback logic

Backport of #3220 for Frodo.

Also includes a backport of 6011c0fd9017ec2f264374aa008a6232b27c1385 because it seemed silly not to also fix that at the same time, since it's a blatant typo/error.