Merge "Fix the higlighted settings not work properly from search" into sc-dev