Fixing QueryForm tool and update build config file