network_tags fixes