Dbatiste/fix main link selector