Better handling of unselected form elements