Modified HIV clause in populateCriteria