Improved the filtering performance
Improved the search algorithm