Improvements to RTargetGroup intropsect

Change-Id: If84a88b2d9a0b0d6eafd8747215be03c2f68e3e4