reworked scraper to work with different terms a bit better