Merge "Fix searched item isn't highlighted"