#180
fix the search issue