added andOr support in filters itself