checkboxes persist from database
fixed merge conflicts for checkbox persists