Highlight search feature

Extracted from original bulky pull request #2435