#827.  Update references for SearchCriteria.