Kraken: Better handling of departure that are also destinations