improve the searching