diff --git a/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf b/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf
index a43c09e..fa78445 100644
--- a/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf
+++ b/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf
@@ -12,51 +12,34 @@ module TP_Mobile_DigitalKey {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-                                ~"TrackApi - smc - PROD~",
-                                ~"digital-key-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
-						~"GET /api/v1/digitalkey/<VIN>/password~",
-                        ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                         ~"TrackApi - smc - PROD~",
+                                         ~"digital-key-composite-service - PROD~"
+                                 )
 				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-                                ~"TrackApi - smc - PROD~",
-                                ~"digital-key-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
-						~"GET /api/v1/digitalkey/<VIN>/password~",
-                        ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy())
+	/
+		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                        ~"TrackApi - smc - PROD~",
+                                        ~"digital-key-composite-service - PROD~"
+                                  )
 				)
-))):splitBy()))
-EOT
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy()))					
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf b/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf
index 6f42aa8..9123b63 100644
--- a/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf
+++ b/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf
@@ -11,60 +11,44 @@ module TP_Mobile_PersonalFavorites {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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-destination-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"POST /api/v2/favorites/~",
-						~"POST /api/v3/favorites/~",
-						~"GET /api/v2/favorites/~",
-						~"GET /api/v3/favorites/~",
-						~"GET /api/v1/favorites~",
-						~"PUT /api/v2/favorites/<favoriteId>~",
-						~"PUT /api/v3/favorites/<favoriteId>~",
-						~"PUT /api/v2/favorites/homework/1~",
-						~"PUT /api/v2/favorites/homework/2~"
-						)")
+    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-destination-composite-service - PROD~"
+					)
 				)
-))):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-destination-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"POST /api/v2/favorites/~",
-						~"POST /api/v3/favorites/~",
-						~"GET /api/v2/favorites/~",
-						~"GET /api/v3/favorites/~",
-						~"GET /api/v1/favorites~",
-						~"PUT /api/v2/favorites/<favoriteId>~",
-						~"PUT /api/v3/favorites/<favoriteId>~",
-						~"PUT /api/v2/favorites/homework/1~",
-						~"PUT /api/v2/favorites/homework/2~"
-						)")
+			,entityName.in(
+					~"POST /api/v2/favorites/~",
+					~"POST /api/v3/favorites/~",
+					~"GET /api/v2/favorites/~",
+					~"GET /api/v3/favorites/~",
+					~"GET /api/v1/favorites~",
+					~"PUT /api/v2/favorites/<favoriteId>~",
+					~"PUT /api/v3/favorites/<favoriteId>~",
+					~"PUT /api/v2/favorites/homework/1~",
+					~"PUT /api/v2/favorites/homework/2~" 
+			)"))))):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-destination-composite-service - PROD~"
+					)
 				)
-))):splitBy()))
-EOT
+			,entityName.in(
+					~"POST /api/v2/favorites/~",
+					~"POST /api/v3/favorites/~",
+					~"GET /api/v2/favorites/~",
+					~"GET /api/v3/favorites/~",
+					~"GET /api/v1/favorites~",
+					~"PUT /api/v2/favorites/<favoriteId>~",
+					~"PUT /api/v3/favorites/<favoriteId>~",
+					~"PUT /api/v2/favorites/homework/1~",
+					~"PUT /api/v2/favorites/homework/2~"
+			)"))))):splitBy()))
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/EMEA_PROD/slo/TP_Mobile_Remote360.tf b/EMEA_PROD/slo/TP_Mobile_Remote360.tf
index e12644d..cbc7ff5 100644
--- a/EMEA_PROD/slo/TP_Mobile_Remote360.tf
+++ b/EMEA_PROD/slo/TP_Mobile_Remote360.tf
@@ -11,58 +11,25 @@ module TP_Mobile_Remote360 {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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(
-								~"remote-360-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"GET /api/v1/events/[UUID]~",
-						~"POST /api/v1/events/[UUID]/cancel~",
-						~"POST /api/v1/event/execute~",
-						~"GET /api/v1/download/[UUID]/<fileName>~",
-						~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
-						~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
-						~"GET /api/v1/vehicle/<VIN>/key~",
-						~"GET /api/v1/recordings/vehicle/<VIN>~" 
-						)")
-				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"remote-360-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"GET /api/v1/events/[UUID]~",
-						~"POST /api/v1/events/[UUID]/cancel~",
-						~"POST /api/v1/event/execute~",
-						~"GET /api/v1/download/[UUID]/<fileName>~",
-						~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
-						~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
-						~"GET /api/v1/vehicle/<VIN>/key~",
-						~"GET /api/v1/recordings/vehicle/<VIN>~" 
-						)")
-				)
-))):splitBy()))
-EOT
+    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(
+                                ~"remote-360-composite-service - PROD~"
+                                )
+                        )
+                        ,entityName.in(
+                                ~"GET /api/v1/events/[UUID]~",
+                                ~"POST /api/v1/events/[UUID]/cancel~",
+                                ~"POST /api/v1/event/execute~",
+                                ~"GET /api/v1/download/[UUID]/<fileName>~",
+                                ~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
+                                ~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
+                                ~"GET /api/v1/vehicle/<VIN>/key~",
+                                ~"GET /api/v1/recordings/vehicle/<VIN>~"
+                        )"))))):splitBy())
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf b/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
index 0c5d5ef..92b4c9e 100644
--- a/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/EMEA_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -11,62 +11,26 @@ module TP_Mobile_RemoteServices {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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-remote-commands-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"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~",
-						~"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>/light-flash~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
-						~"POST /api/v2/presentation/remote-commands/eventPosition~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
-				)
-))):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-remote-commands-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"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~",
-						~"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>/light-flash~",
-						~"POST /api/v2/presentation/remote-commands/<VIN>/charging-profile~",
-						~"POST /api/v2/presentation/remote-commands/eventPosition~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
-				)
-))):splitBy()))
-EOT
+    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-destination-composite-service - PROD~"
+                                )
+                        )
+                        ,entityName.in(
+                                ~"POST /api/v2/favorites/~",
+                                ~"POST /api/v3/favorites/~",
+                                ~"GET /api/v2/favorites/~",
+                                ~"GET /api/v3/favorites/~",
+                                ~"GET /api/v1/favorites~",
+                                ~"PUT /api/v2/favorites/<favoriteId>~",
+                                ~"PUT /api/v3/favorites/<favoriteId>~",
+                                ~"PUT /api/v2/favorites/homework/1~",
+                                ~"PUT /api/v2/favorites/homework/2~"
+                        )"))))):splitBy())
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf b/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
index c8b339c..1c9b8b7 100644
--- a/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
+++ b/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
@@ -11,36 +11,20 @@ module TP_Mobile_Send2VehicleLegacy {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
-(100)*
-((builtin:service.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
-					entitySelector("type(service),
-					entityName.in(
-							~"LegacyPoiApi - msgsvc - prod~"
-							)
-					")
-				)
-			)
-)):splitBy())
-/
-(builtin:service.requestCount.total:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
-					entitySelector("type(service),
-					entityName.in(
-							~"LegacyPoiApi - msgsvc - prod~"
-							)
-					")
-				)
-			)
-)):splitBy()))
-EOT
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
+		        entitySelector("type(service),
+				entityName.in(
+					~"LegacyPoiApi - msgsvc - prod~"
+						)
+					"))))):splitBy())
+        /
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+			entityName.in(
+				~"LegacyPoiApi - msgsvc - prod~"
+					)
+					"))))):splitBy()))
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf b/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
index ffa243d..f9ccb12 100644
--- a/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
+++ b/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
@@ -11,46 +11,29 @@ module TP_Mobile_Send2VehicleMGU {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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(
-								~"TripService - PROD~"
-								)
-						)
-					,entityName.in(
-						~"/v2/motorist/[UUID]/trips~",
-						~"/v3/motorist/[UUID]/trips~"
-						)")
+    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(
+                                                ~"TripService - PROD~"
+                                        )
 				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"TripService - PROD~"
-								)
-						)
-					,entityName.in(
-						~"/v2/motorist/[UUID]/trips~",
-						~"/v3/motorist/[UUID]/trips~"
-						)")
+				,entityName.in(
+                                        ~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
 				)
-))):splitBy()))
-EOT
+				,entityName.in(
+					~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy()))
+    EOT 
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/EMEA_PROD/slo/TP_Mobile_VehicleData.tf b/EMEA_PROD/slo/TP_Mobile_VehicleData.tf
index 17335a5..c1a92d0 100644
--- a/EMEA_PROD/slo/TP_Mobile_VehicleData.tf
+++ b/EMEA_PROD/slo/TP_Mobile_VehicleData.tf
@@ -11,48 +11,20 @@ module TP_Mobile_VehicleData {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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(
+    metric_expression           = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~",
                                 ~"VehicleService - PROD~"
                                 )
                         )
-                    ,entityName.in(
-                        ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
-                        )")
-                )
-))):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~",
-                                ~"VehicleService - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
-                        )")
-                )
-))):splitBy()))
-EOT
+                        ,entityName.in(
+                                ~"GET /api/v1/vehicles/<VIN>/state~",
+                                ~"GET /v1/vehicle/<VIN>~",
+                                ~"GET /v2/vehicle/<VIN>~"
+                                )")))):splitBy())
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_DigitalKey.tf b/NA_PROD/slo/TP_Mobile_DigitalKey.tf
index a43c09e..fa78445 100644
--- a/NA_PROD/slo/TP_Mobile_DigitalKey.tf
+++ b/NA_PROD/slo/TP_Mobile_DigitalKey.tf
@@ -12,51 +12,34 @@ module TP_Mobile_DigitalKey {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-                                ~"TrackApi - smc - PROD~",
-                                ~"digital-key-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
-						~"GET /api/v1/digitalkey/<VIN>/password~",
-                        ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                         ~"TrackApi - smc - PROD~",
+                                         ~"digital-key-composite-service - PROD~"
+                                 )
 				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-                                ~"TrackApi - smc - PROD~",
-                                ~"digital-key-composite-service - PROD~"
-                            )
-						)
-					,entityName.in(
-						~"POST /smc2-bl/track/v2/trackKey~",
-						~"POST /smc2-bl/track/v2/manageKey~",
-						~"GET /api/v1/digitalkey/<VIN>/password~",
-                        ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-						)")
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy())
+	/
+		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                        ~"TrackApi - smc - PROD~",
+                                        ~"digital-key-composite-service - PROD~"
+                                  )
 				)
-))):splitBy()))
-EOT
+			,entityName.in(
+				~"trackKey~",
+				~"manageKey~",
+				~"GET /api/v1/digitalkey/<VIN>/password~",
+                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
+			)"))))):splitBy()))					
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_Login.tf b/NA_PROD/slo/TP_Mobile_Login.tf
index 7a0bb0f..75e4822 100644
--- a/NA_PROD/slo/TP_Mobile_Login.tf
+++ b/NA_PROD/slo/TP_Mobile_Login.tf
@@ -11,50 +11,21 @@ module TP_Mobile_Login {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"btc-user-composite-service - PROD~",
                                 ~"btc-connected-oauth-service - PROD~"
                                 )
                         )
-                    ,entityName.in(
-                        ~"GET /api/v1/presentation/oauth/config~",
-                        ~"GET /api/v1/presentation/profile-tab~",
-                        ~"POST /api/v1/oauth/token/identifier~"
-                        )")
-                )
-))):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-user-composite-service - PROD~",
-                                ~"btc-connected-oauth-service - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v1/presentation/oauth/config~",
-                        ~"GET /api/v1/presentation/profile-tab~",
-                        ~"POST /api/v1/oauth/token/identifier~"
-                        )")
-                )
-))):splitBy()))
-EOT
+                        ,entityName.in(
+                                ~"GET /api/v1/presentation/oauth/config~",
+                                ~"GET /api/v1/presentation/profile-tab~",
+                                ~"POST /api/v1/oauth/token/identifier~"
+                                )"))))):splitBy())
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf b/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf
index d71a5de..937021f 100644
--- a/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf
+++ b/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf
@@ -11,56 +11,40 @@ module TP_Mobile_PersonalFavorites {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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-destination-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"POST /api/v2/favorites/~",
-						~"POST /api/v3/favorites/~",
-						~"GET /api/v2/favorites/~",
-						~"GET /api/v3/favorites/~",
-						~"PUT /api/v2/favorites/<favoriteId>~",
-						~"PUT /api/v3/favorites/<favoriteId>~",
-						~"DELETE /api/v2/favorites/<favoriteId>~"
-						)")
+    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-destination-composite-service - PROD~"
+					)
 				)
-))):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-destination-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"POST /api/v2/favorites/~",
-						~"POST /api/v3/favorites/~",
-						~"GET /api/v2/favorites/~",
-						~"GET /api/v3/favorites/~",
-						~"PUT /api/v2/favorites/<favoriteId>~",
-						~"PUT /api/v3/favorites/<favoriteId>~",
-						~"DELETE /api/v2/favorites/<favoriteId>~"
-						)")
+			,entityName.in(
+					~"POST /api/v2/favorites/~",
+					~"POST /api/v3/favorites/~",
+					~"GET /api/v2/favorites/~",
+					~"GET /api/v3/favorites/~",
+					~"PUT /api/v2/favorites/<favoriteId>~",
+					~"PUT /api/v3/favorites/<favoriteId>~",
+					~"DELETE /api/v2/favorites/<favoriteId>~"
+			)"))))):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-destination-composite-service - PROD~"
+					)
 				)
-))):splitBy()))
-EOT
+			,entityName.in(
+					~"POST /api/v2/favorites/~",
+					~"POST /api/v3/favorites/~",
+					~"GET /api/v2/favorites/~",
+					~"GET /api/v3/favorites/~",
+					~"PUT /api/v2/favorites/<favoriteId>~",
+					~"PUT /api/v3/favorites/<favoriteId>~",
+					~"DELETE /api/v2/favorites/<favoriteId>~"
+			)"))))):splitBy()))
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_Remote360.tf b/NA_PROD/slo/TP_Mobile_Remote360.tf
index e12644d..a2a2b2b 100644
--- a/NA_PROD/slo/TP_Mobile_Remote360.tf
+++ b/NA_PROD/slo/TP_Mobile_Remote360.tf
@@ -11,58 +11,25 @@ module TP_Mobile_Remote360 {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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(
-								~"remote-360-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"GET /api/v1/events/[UUID]~",
-						~"POST /api/v1/events/[UUID]/cancel~",
-						~"POST /api/v1/event/execute~",
-						~"GET /api/v1/download/[UUID]/<fileName>~",
-						~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
-						~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
-						~"GET /api/v1/vehicle/<VIN>/key~",
-						~"GET /api/v1/recordings/vehicle/<VIN>~" 
-						)")
-				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"remote-360-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"GET /api/v1/events/[UUID]~",
-						~"POST /api/v1/events/[UUID]/cancel~",
-						~"POST /api/v1/event/execute~",
-						~"GET /api/v1/download/[UUID]/<fileName>~",
-						~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
-						~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
-						~"GET /api/v1/vehicle/<VIN>/key~",
-						~"GET /api/v1/recordings/vehicle/<VIN>~" 
-						)")
-				)
-))):splitBy()))
-EOT
+    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(
+                                        ~"remote-360-composite-service - PROD~"
+                                )
+                        )
+                        ,entityName.in(
+                                ~"GET /api/v1/events/[UUID]~",
+                                ~"POST /api/v1/events/[UUID]/cancel~",
+                                ~"POST /api/v1/event/execute~",
+                                ~"GET /api/v1/download/[UUID]/<fileName>~",
+                                ~"POST /api/v1/download/[UUID]/<fileName>/confirm~",
+                                ~"GET /api/v1/vehicle/<VIN>/egomodelurl~",
+                                ~"GET /api/v1/vehicle/<VIN>/key~",
+                                ~"GET /api/v1/recordings/vehicle/<VIN>~"
+                        )"))))):splitBy())
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_RemoteServices.tf b/NA_PROD/slo/TP_Mobile_RemoteServices.tf
index 877b6ca..b6dfa71 100644
--- a/NA_PROD/slo/TP_Mobile_RemoteServices.tf
+++ b/NA_PROD/slo/TP_Mobile_RemoteServices.tf
@@ -11,68 +11,30 @@ module TP_Mobile_RemoteServices {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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-remote-commands-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"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~",
-						~"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>/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~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
-						~"GET /api/v2/presentation/remote-history/<VIN>~",
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
-				)
-))):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-remote-commands-composite-service - PROD~"
-								)
-						)
-					,entityName.in(
-						~"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~",
-						~"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>/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~",
-						~"GET /api/v1/presentation/remote-history/<VIN>~",
-						~"GET /api/v2/presentation/remote-history/<VIN>~",
-						~"POST /api/v2/presentation/remote-commands/eventStatus~"
-						)")
-				)
-))):splitBy()))
-EOT
+    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~"
+                                )
+                        )
+                                ,entityName.in(
+                                        ~"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~",
+                                        ~"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>/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~",
+                                        ~"GET /api/v1/presentation/remote-history/<VIN>~",
+                                        ~"GET /api/v2/presentation/remote-history/<VIN>~",
+                                        ~"POST /api/v2/presentation/remote-commands/eventStatus~"
+                                )"))))):splitBy())
+
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf b/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
index c8b339c..1c9b8b7 100644
--- a/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
+++ b/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
@@ -11,36 +11,20 @@ module TP_Mobile_Send2VehicleLegacy {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<-EOT
-(100)*
-((builtin:service.errors.server.successCount:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
-					entitySelector("type(service),
-					entityName.in(
-							~"LegacyPoiApi - msgsvc - prod~"
-							)
-					")
-				)
-			)
-)):splitBy())
-/
-(builtin:service.requestCount.total:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service",
-					entitySelector("type(service),
-					entityName.in(
-							~"LegacyPoiApi - msgsvc - prod~"
-							)
-					")
-				)
-			)
-)):splitBy()))
-EOT
+    metric_expression           = <<EOT
+        (100)*((builtin:service.errors.server.successCount:filter(and(or(in("dt.entity.service",
+		        entitySelector("type(service),
+				entityName.in(
+					~"LegacyPoiApi - msgsvc - prod~"
+						)
+					"))))):splitBy())
+        /
+        (builtin:service.requestCount.total:filter(and(or(in("dt.entity.service",entitySelector("type(service),
+			entityName.in(
+				~"LegacyPoiApi - msgsvc - prod~"
+					)
+					"))))):splitBy()))
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf b/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
index ffa243d..9c98d73 100644
--- a/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
+++ b/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
@@ -11,46 +11,29 @@ module TP_Mobile_Send2VehicleMGU {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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(
-								~"TripService - PROD~"
-								)
-						)
-					,entityName.in(
-						~"/v2/motorist/[UUID]/trips~",
-						~"/v3/motorist/[UUID]/trips~"
-						)")
+    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(
+                                                ~"TripService - PROD~"
+                                        )
 				)
-))):splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(
-	and(
-		or(
-			in(
-				"dt.entity.service_method",
-					entitySelector(
-						"type(service_method),
-						fromRelationship.isServiceMethodOfService(
-							type(~"SERVICE~"),entityName.in(
-								~"TripService - PROD~"
-								)
-						)
-					,entityName.in(
-						~"/v2/motorist/[UUID]/trips~",
-						~"/v3/motorist/[UUID]/trips~"
-						)")
+				,entityName.in(
+                                        ~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+				fromRelationship.isServiceMethodOfService(
+					type(~"SERVICE~"),entityName.in(
+                                                ~"TripService - PROD~"
+                                        )
 				)
-))):splitBy()))
-EOT
+				,entityName.in(
+					~"/v2/motorist/[UUID]/trips~",
+                                        ~"/v3/motorist/[UUID]/trips~"
+                                        )"))))):splitBy()))
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"         
diff --git a/NA_PROD/slo/TP_Mobile_VehicleData.tf b/NA_PROD/slo/TP_Mobile_VehicleData.tf
index 17335a5..c1a92d0 100644
--- a/NA_PROD/slo/TP_Mobile_VehicleData.tf
+++ b/NA_PROD/slo/TP_Mobile_VehicleData.tf
@@ -11,48 +11,20 @@ module TP_Mobile_VehicleData {
     filter                      = ""            
 
     #metric expression of the calculation as done in data explorer ui
-    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(
+    metric_expression           = <<EOT
+    (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
                                 ~"btc-vehicle-composite-service - PROD~",
                                 ~"VehicleService - PROD~"
                                 )
                         )
-                    ,entityName.in(
-                        ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
-                        )")
-                )
-))):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~",
-                                ~"VehicleService - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v1/vehicles/<VIN>/state~",
-                        ~"GET /v1/vehicle/<VIN>~"
-                        )")
-                )
-))):splitBy()))
-EOT
+                        ,entityName.in(
+                                ~"GET /api/v1/vehicles/<VIN>/state~",
+                                ~"GET /v1/vehicle/<VIN>~",
+                                ~"GET /v2/vehicle/<VIN>~"
+                                )")))):splitBy())
+    EOT
 
 #if not set (removed) it's defaulted to "-1d" 
 timeframe                   = "-1d"