Redo the way the query body is done to handle multiple conditions following the query expression.