reorg querybuilder.js