Fixed ordering to be by date