Fix for SearchQueryMultipleFilters test
Allow omitting billinginfo
Clean up some flight code
Merge branch 'feature/misc' into feature/unit-tests