refactor filters, start using includes