obsolete code
there was really no need for a QueryHandler class

also trying to respect cancellation token