Finally fix edit form problem with checkboxes