highlight matches in selected search result
Merge remote-tracking branch 'origin/master'