Fixes i check the checkbox
Fixed check boxes
Merge branch 'BPFD-758'