Remove CriteriaQueryBuilder for now and stick with HqlQueryBuilder, which has established itself as the go-to