Merge "Fix search highlight"