Start to implement sort by date