Split chooseEntry into two chooseEntry and chooseEntries