Completed QueryBuilder new version integration