Modification on SelectIntrigue to manage TPJ & PJG roles