fix delegation on query class