Improve the search

Improve the search speed