Add query to predicates, separate from path to allow order-independence
of query params