Implement AddOr method and simplify Query creation code
Activate test for or queries
Add test for AddOr