fixed different date error, changed sorting