stop using custom "Query" object