WV-912: Checkboxes now properly working