More updates to allow flight tags