Fixing handling of multiple role matches to a role search name