diff --git a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json b/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
index 9d6a5c50..1c620981 100644
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
@@ -982,24 +982,23 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [
-                  {
-                    "filter": "dt.entity.service",
-                    "filterType": "TAG",
-                    "filterOperator": "OR",
-                    "nestedFilters": [],
-                    "criteria": [
-                      {
-                        "value": "Environment:{{.env}}",
-                        "evaluator": "IN"
-                      }
-                    ]
-                  }
-                ],
+                "nestedFilters": [],
                 "criteria": [
                   {
                     "value": "{{.agent2}}",
@@ -1125,24 +1124,23 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [
-                  {
-                    "filter": "dt.entity.service",
-                    "filterType": "TAG",
-                    "filterOperator": "OR",
-                    "nestedFilters": [],
-                    "criteria": [
-                      {
-                        "value": "Environment:{{.env}}",
-                        "evaluator": "IN"
-                      }
-                    ]
-                  }
-                ],
+                "nestedFilters": [],
                 "criteria": [
                   {
                     "value": "{{.agent3}}",
@@ -1320,24 +1318,23 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [
-                  {
-                    "filter": "dt.entity.service",
-                    "filterType": "TAG",
-                    "filterOperator": "OR",
-                    "nestedFilters": [],
-                    "criteria": [
-                      {
-                        "value": "Environment:{{.env}}",
-                        "evaluator": "IN"
-                      }
-                    ]
-                  }
-                ],
+                "nestedFilters": [],
                 "criteria": [
                   {
                     "value": "{{.agent3}}",
@@ -1435,24 +1432,23 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [
-                  {
-                    "filter": "dt.entity.service",
-                    "filterType": "TAG",
-                    "filterOperator": "OR",
-                    "nestedFilters": [],
-                    "criteria": [
-                      {
-                        "value": "Environment:{{.env}}",
-                        "evaluator": "IN"
-                      }
-                    ]
-                  }
-                ],
+                "nestedFilters": [],
                 "criteria": [
                   {
                     "value": "{{.agent1}}",
@@ -1630,24 +1626,23 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [
-                  {
-                    "filter": "dt.entity.service",
-                    "filterType": "TAG",
-                    "filterOperator": "OR",
-                    "nestedFilters": [],
-                    "criteria": [
-                      {
-                        "value": "Environment:{{.env}}",
-                        "evaluator": "IN"
-                      }
-                    ]
-                  }
-                ],
+                "nestedFilters": [],
                 "criteria": [
                   {
                     "value": "{{.agent1}}",
@@ -1772,24 +1767,23 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [
-                  {
-                    "filter": "dt.entity.service",
-                    "filterType": "TAG",
-                    "filterOperator": "OR",
-                    "nestedFilters": [],
-                    "criteria": [
-                      {
-                        "value": "Environment:{{.env}}",
-                        "evaluator": "IN"
-                      }
-                    ]
-                  }
-                ],
+                "nestedFilters": [],
                 "criteria": [
                   {
                     "value": "{{.agent2}}",