update to sort first by year, then by name