fixed sort by date