Fixed drawing and searching on the extended roles.