Refactor flight show to remove N+1 query