Improve handling of duplicate checkboxes
v1.0.4