Handle multiple checkboxes better