modify clause and query to enable predicates to be connected by both comma and semi-colon