Added order by date within order by status