Improvements to RTargetGroup intropsect

Change-Id: I74f3395e00c57dfe46d05d79eb695eefe366dbc6