Fix search elements
Fix search elements