fix querybuilder