Reorganize DuelSelect logic