Move the query params to their own AST and add a QueryBuilder