Fix search for xs