Added highlighing of search matches

Change-Id: I39598372677f10a991fdfa1f123a1736f7c76b75