Merge "Fix search highlighting items"