Added completion for the remaining search-criteria.