Better behavior - clear on submit, not on deselect