Improve onflight tracker + topic integration