Highlighted search

The second duplicated commit (latest) was actually a cleanup commit.

Let me know if you find any issues