resolve the search issue