Edit the oncall part in populateCriteria