Minor fix to support Criteria Search