Cleanup of Code

new Feature hightlight search result

Change-Id: I16d90caf95250ccf0bba7169218da49b758dadde