modify for the search issue