Network tab validation rework

Change-Id: Ida0c2a8ed2abb9aa3211a87d4470a302c1340800