fix bugs
improve performance
improve search performance
fix typo