add error message and change enter selection to just enter