Filter function now can filter OR within fields, and AND between fields