Fixed ordering issue Excel file (null values should be at the end and we need a chronological order)