improved SearchCriteria
updated dependencies