re-organizing the return value of report nodes

Change-Id: Iea50bfc69841e9efe530fb1d92be27ffa8d20690