Fix route and Finn selection issue