Search basically working
Highlighting working