Fixed encoding and sort by year