Much better date sorting working