ENH:finish the work of search