Implement and fix OR predicates