Sub role/class select improved