Now all queries work with the new parser