Fixed some NightOrder and MorningOrder data collection