Add cabin filters and fix fares builder