Added more validation for SEARCH-1000.