Add where clause to query.peg