Rename Query to Predicate and remove and operator