Fix dates and grid orders