Move element search outside of attribute scraper
Refactor attribute scraper to separate filters