Added sort, fixed date formats