Add loading by date, fix ordering too