PCT-671: further separate query manager from it's services