Added flight back in salutation, fixed POPS-291