fix for duplicate flights in some circumstances
updates on the status template