DAR-2520: Fix to handle more checkboxes