add more generic filters, refactor, build fails