LPS-33545 apply new pattern to selection of roles

Tested and reviewed.