Updating zpr to allow collecting per an environment tag