updating QueryCreator and BasicQueryCreator to use new util class