Fix search and date format