Some small bugfixes to scraping, should possibly help getting locations