Fix bugs for baggage plan