Remove useless span
Fix search