Fix search fields