Checkboxradio: updates based on pr review