Fix CSV output order