Merge "Improve Preference highlighting for Search"