Fix baggage plan bugs