fix a lot of bugs in "user selection"