Added support for distinguishing between filtering a single role vs a
collection of roles.