Scraper: use class var to avoid passing instance to be indexed
Scraper: better indexing

Previously, indexing destinations was failing