ENH: Reorder date regex and remove duplicate ISO8601 format