add feature search and fix bug