Some cosmetic changes
Fix search