move group_by prior to network-setup

Change-Id: Id854a61f904fe9af483a0d71c818fbc6c6e60d50