Fixed role/class buttons unchecking