Added support for choosing "and" and "or" logic between local filters