Express stream follow up for CPS groups
ATR-20870 Fixed CPS checking when using express chains missed in !52601 (merged)
- added a warning to notify if something in the logic fails
- also minor code improvements, one as suggested in the comment from previous MR @rbielski