Improve radio/checkbox selection; fix