make new version of new query wizard