refactor flight search to reduce owner information sent