fix flight/passenger/shopping cart logic