Minor improvements in sort order, deadline date order is still sad