diff --git a/CN_PROD/slo/TP_Mobile_RemoteServices.tf b/CN_PROD/slo/TP_Mobile_RemoteServices.tf
index 82252c8..d33f8d0 100644
--- a/CN_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/CN_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -12,66 +12,34 @@ module TP_Mobile_RemoteServices {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(and(in("dt.entity.service_method",entitySelector("type(service_method),
-		fromRelationship.isServiceMethodOfService(
-			type(~"SERVICE~"),entityName.in(
-				~"btc-vehicle-remote-commands-composite-service - PROD~"
-				)
-		)
-		,entityName.in(
-                        ~"POST /api/v2/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~"
-			)")
-		)
-)):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(and(in("dt.entity.service_method",entitySelector("type(service_method),
-		fromRelationship.isServiceMethodOfService(
-			type(~"SERVICE~"),entityName.in(
-				~"btc-vehicle-remote-commands-composite-service - PROD~"
-				)
-		)
-                ,entityName.in(
-                        ~"POST /api/v2/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~"
-			)")
-		)
-)):splitBy()))
+(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"btc-vehicle-remote-commands-composite-service - PROD~"
+                                )
+                        )
+                                ,entityName.in(
+                                        ~"POST /api/v2/presentation/remote-commands/eventStatus~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventPosition~"
+                                )"))))):splitBy())
     EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
index fbe0c5f..4c2c809 100644
--- a/CN_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
@@ -15,66 +15,34 @@ module Wirkkette__Remote_Services__-_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(and(in("dt.entity.service_method",entitySelector("type(service_method),
-		fromRelationship.isServiceMethodOfService(
-			type(~"SERVICE~"),entityName.in(
-				~"btc-vehicle-remote-commands-composite-service - PROD~"
-				)
-		)
-		,entityName.in(
-                        ~"POST /api/v2/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~"
-			)")
-		)
-)):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(and(in("dt.entity.service_method",entitySelector("type(service_method),
-		fromRelationship.isServiceMethodOfService(
-			type(~"SERVICE~"),entityName.in(
-				~"btc-vehicle-remote-commands-composite-service - PROD~"
-				)
-		)
-                ,entityName.in(
-                        ~"POST /api/v2/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
-                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
-                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
-                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~"
-			)")
-		)
-)):splitBy()))
+(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"btc-vehicle-remote-commands-composite-service - PROD~"
+                                )
+                        )
+                                ,entityName.in(
+                                        ~"POST /api/v2/presentation/remote-commands/eventStatus~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventPosition~"
+                                )"))))):splitBy())
     EOT
  
 
diff --git a/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf b/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
index dadc566..b5332a3 100644
--- a/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -38,7 +38,9 @@ module TP_Mobile_RemoteServices {
                                 ~"GET /api/v3/presentation/remote-history/<VIN>~",
                                 ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
                                 ~"POST /api/v2/presentation/remote-commands/eventPosition~",
-                                ~"POST /api/v3/presentation/remote-commands/eventPosition~"
+                                ~"POST /api/v3/presentation/remote-commands/eventPosition~",
+								~"POST /api/v3/presentation/remote-commands/eventStatus~",
+								~"POST /api/v2/presentation/remote-commands/eventStatus~"
                         )"))))):splitBy())
 
     EOT
diff --git a/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
index d0da7cf..a72fa36 100644
--- a/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
@@ -22,17 +22,28 @@ module Wirkkette__Remote_Services__-_Reliability_of_key_requests {
                                 )
                         )
                         ,entityName.in(
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",                             
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",                             
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",                                
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",                               
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",                                
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",                               
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",                               
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",
+                                ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
                                 ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                                ~"GET /api/v2/presentation/remote-history/<VIN>~",                                
+                                ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                ~"GET /api/v3/presentation/remote-history/<VIN>~",
                                 ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
-                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",                                
+                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                ~"POST /api/v3/presentation/remote-commands/eventPosition~",
+                                ~"POST /api/v3/presentation/remote-commands/eventStatus~",
+                                ~"POST /api/v2/presentation/remote-commands/eventStatus~"
                         )"))))):splitBy())
 
     EOT
diff --git a/NA_PROD/slo/TP_Mobile_RemoteServices.tf b/NA_PROD/slo/TP_Mobile_RemoteServices.tf
index c8a1a2b..337b62a 100644
--- a/NA_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/NA_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -38,7 +38,9 @@ module TP_Mobile_RemoteServices {
                                         ~"POST /api/v3/presentation/remote-commands/eventPosition~",
                                         ~"GET /api/v1/presentation/remote-history/<VIN>~",
                                         ~"GET /api/v2/presentation/remote-history/<VIN>~",
-                                        ~"GET /api/v3/presentation/remote-history/<VIN>~"
+                                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
+                                        ~"POST /api/v2/presentation/remote-commands/eventStatus~"
                                 )"))))):splitBy())
 
     EOT
diff --git a/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
index 4206b8f..654c0cf 100644
--- a/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Remote_Services__-_Reliability_of_key_requests.tf
@@ -16,24 +16,35 @@ module Wirkkette__Remote_Services__-_Reliability_of_key_requests {
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
     (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
-                fromRelationship.isServiceMethodOfService(
-                        type(~"SERVICE~"),entityName.in(
-                                ~"btc-vehicle-remote-commands-composite-service - PROD~"
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"btc-vehicle-remote-commands-composite-service - PROD~"
                                 )
                         )
-                        ,entityName.in(
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",                             
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",                             
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",                                
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",                               
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",                                
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",                               
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",                               
-                                ~"GET /api/v1/presentation/remote-history/<VIN>~",
-                                ~"GET /api/v2/presentation/remote-history/<VIN>~",                                
-                                ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
-                                ~"POST /api/v2/presentation/remote-commands/eventPosition~",                                
-                        )"))))):splitBy())
+                                ,entityName.in(
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-lock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-lock~",										
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/door-unlock~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-now~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/vehicle-finder~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/climate-timer~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/climate-timer~",								
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/light-flash~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/light-flash~",
+                                        ~"POST /api/v3/presentation/remote-commands/<VIN>/horn-blow~",									
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/horn-blow~",
+                                        ~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",										
+                                        ~"POST /api/v2/presentation/remote-commands/eventPosition~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventPosition~",
+                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                        ~"GET /api/v3/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v3/presentation/remote-commands/eventStatus~",
+                                        ~"POST /api/v2/presentation/remote-commands/eventStatus~"
+                                )"))))):splitBy())
 
 
     EOT