Use of baseQueryCriteria is now configurable