Improvements of search and highlight