Added date and sorting, hopefully fixed charset