Merge "Search results always highlight proper results" into oc-dev