Improvements to RTargetGroup intropsect

Change-Id: I9ee1055c68ca4a71ac803a6164b7688708a49ca4