Added incremental search and search highlight