Update Searcher and Indexer

highlight and fix searching in indexer
#87