before merging querymanage
before merging
some tests needed to be done