Completed email + Date + Sorting changes