WIP: correct sorting of destinations