Yes/No fix for checkbox types