Fix search highlighting regression