diff --git a/CN_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
index e46e67a..5759e9f 100644
--- a/CN_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
@@ -10,20 +10,11 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-959F2E3E489257E0\")" 
+    filter                      = "" 
             
-
-    #metric expression of the calculation as done in data explorer ui
-    #metric_expression           = "(100)*(builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy())" 
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
+	(100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",
+					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~"
@@ -31,17 +22,10 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
 						)
 					,entityName.in(
 						~"GET /api/v1/vehicles~"
-						)")
-				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
+						)"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",
+					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~"
@@ -49,9 +33,7 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
 						)
 					,entityName.in(
 					    ~"GET /api/v1/vehicles~"
-						)")
-				)
-))):splitBy()))
+						)"))))):splitBy()))
 EOT
  
 
@@ -63,9 +45,7 @@ EOT
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98					#if not set(removed) it's defaulted to 98
+    warning                     = 99					#if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/EMEA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
index 7e9ba65..87f5ea6 100644
--- a/EMEA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
@@ -12,18 +12,10 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
     #entity selector object 
     filter                      = "" 
             
-
-    #metric expression of the calculation as done in data explorer ui
-    #metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
+ 
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
+	(100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",
+					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~"
@@ -31,17 +23,10 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
 						)
 					,entityName.in(
 						~"GET /api/v2/vehicles~"
-						)")
-				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
+						)"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",
+					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~"
@@ -49,9 +34,7 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
 						)
 					,entityName.in(
 					    ~"GET /api/v2/vehicles~"
-						)")
-				)
-))):splitBy()))
+						)"))))):splitBy()))
 EOT
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -62,9 +45,7 @@ EOT
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98					#if not set(removed) it's defaulted to 98
+    warning                     = 99					#if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
index 5b4007e..ffbc872 100644
--- a/NA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Vehicle_List__-_Reliability_of_key_requests.tf
@@ -10,20 +10,12 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-86B411308156FCB0\")" 
+    filter                      = "" 
             
-
-    #metric expression of the calculation as done in data explorer ui
-    #metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
-  metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
+ 
+  	metric_expression           = <<-EOT
+  	(100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",
+					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~"
@@ -31,17 +23,10 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
 						)
 					,entityName.in(
 						~"GET /api/v2/vehicles~"
-						)")
-				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
+						)"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",
+					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~"
@@ -49,9 +34,7 @@ module Wirkkette__Vehicle_List__-_Reliability_of_key_requests {
 						)
 					,entityName.in(
 					    ~"GET /api/v2/vehicles~"
-						)")
-				)
-))):splitBy()))
+						)"))))):splitBy()))
 EOT
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -62,9 +45,7 @@ EOT
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98					#if not set(removed) it's defaulted to 98
+    warning                     = 99					#if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file