added more filter terms, refactor