fix order by date