Fix search queries