updating BasicQueryCreator to use new util class