diff --git a/CN_PROD/slo/TP_Mobile_DigitalKey.tf b/CN_PROD/slo/TP_Mobile_DigitalKey.tf
index b7693c2..9cd602a 100644
--- a/CN_PROD/slo/TP_Mobile_DigitalKey.tf
+++ b/CN_PROD/slo/TP_Mobile_DigitalKey.tf
@@ -12,7 +12,7 @@ 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),
+(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(
                                          ~"TrackApi - smc - PROD~",
@@ -24,21 +24,7 @@ module TP_Mobile_DigitalKey {
 				~"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~"
-                                  )
-				)
-			,entityName.in(
-				~"trackKey~",
-				~"manageKey~",
-				~"GET /api/v1/digitalkey/<VIN>/password~",
-                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-			)"))))):splitBy()))					
+			)"))))):splitBy())			
     EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Mobile_Mapping.tf b/CN_PROD/slo/TP_Mobile_Mapping.tf
index 0d72575..826ca17 100644
--- a/CN_PROD/slo/TP_Mobile_Mapping.tf
+++ b/CN_PROD/slo/TP_Mobile_Mapping.tf
@@ -12,8 +12,8 @@ module TP_Mobile_Mapping {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(
+(100)-
+(builtin:service.keyRequest.errors.server.rate:filter(
     and(
         or(
             in(
@@ -36,30 +36,6 @@ module TP_Mobile_Mapping {
                         )")
                 )
 ))):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~",
-                                ~"vehicle-mapping-composite-service - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v2/presentation/users/validate~",
-                        ~"POST /api/v2/vehicles/<VIN>/primary~",
-                        ~"POST /api/v2/vehicles/<VIN>/primary/map~",
-						~"POST /api/v1/vehicles/<VIN>/validate-security-code~",
-						~"POST /api/v1/vehicles/<VIN>/resend-security-code~",
-						~"DELETE /api/v1/vehicles/<VIN>~"
-                        )")
-                )
-))):splitBy()))
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Mobile_PersonalFavorites.tf b/CN_PROD/slo/TP_Mobile_PersonalFavorites.tf
index 1bd3eb6..f071e50 100644
--- a/CN_PROD/slo/TP_Mobile_PersonalFavorites.tf
+++ b/CN_PROD/slo/TP_Mobile_PersonalFavorites.tf
@@ -12,7 +12,7 @@ module TP_Mobile_PersonalFavorites {
 
     #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),
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
 			        type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -23,18 +23,6 @@ module TP_Mobile_PersonalFavorites {
                                         ~"POST /api/v3/favorites/~",
                                         ~"PUT /api/v3/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~"
-					)
-				)
-			,entityName.in(
-					~"GET /api/v3/favorites/~",
-                                        ~"POST /api/v3/favorites/~",
-                                        ~"PUT /api/v3/favorites/<favoriteId>~"
-			)"))))):splitBy()))
 
     EOT
 
diff --git a/CN_PROD/slo/TP_Mobile_RSU.tf b/CN_PROD/slo/TP_Mobile_RSU.tf
index 6c37f47..221c725 100644
--- a/CN_PROD/slo/TP_Mobile_RSU.tf
+++ b/CN_PROD/slo/TP_Mobile_RSU.tf
@@ -12,7 +12,7 @@ module TP_Mobile_RSU {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"RemoteSoftwareUpgrade.WebApp - PROD~"
@@ -27,22 +27,6 @@ module TP_Mobile_RSU {
                         ~"POST /v2/vehicle/rsustatus/preparationCompleted~",
 						~"POST /v2/vehicle/rsustatus/updateAvailable~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-								~"RemoteSoftwareUpgrade.WebApp - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"POST /v1/vehicle/rsustatus/finishInstallation~",
-                        ~"POST /v1/vehicle/rsustatus/preparationCompleted~",
-						~"POST /v1/vehicle/rsustatus/updateAvailable~",
-
-                        ~"POST /v2/vehicle/rsustatus/finishInstallation~",
-                        ~"POST /v2/vehicle/rsustatus/preparationCompleted~",
-						~"POST /v2/vehicle/rsustatus/updateAvailable~"
-                        )"))))):splitBy()))
 
 EOT
 
diff --git a/CN_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf b/CN_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
index 2910605..8744b57 100644
--- a/CN_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
+++ b/CN_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
@@ -12,18 +12,12 @@ module TP_Mobile_Send2VehicleLegacy {
 
     #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",
+        (100)-(builtin:service.errors.server.rate: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" 
diff --git a/CN_PROD/slo/TP_Mobile_Send2VehicleMGU.tf b/CN_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
index ff6ca61..1c2cecb 100644
--- a/CN_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
+++ b/CN_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
@@ -12,7 +12,7 @@ module TP_Mobile_Send2VehicleMGU {
 
     #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),
+        (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -21,16 +21,6 @@ module TP_Mobile_Send2VehicleMGU {
 				,entityName.in(
                                          ~"/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~"
-                                        )
-				)
-				,entityName.in(
-                                        ~"/v3/motorist/[UUID]/trips~"
-                                        )"))))):splitBy()))
     EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Mobile_VehicleList.tf b/CN_PROD/slo/TP_Mobile_VehicleList.tf
index c63ecf7..db849e2 100644
--- a/CN_PROD/slo/TP_Mobile_VehicleList.tf
+++ b/CN_PROD/slo/TP_Mobile_VehicleList.tf
@@ -12,7 +12,7 @@ module TP_Mobile_VehicleList {
 
     #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",
+	(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",
 					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
@@ -23,18 +23,6 @@ module TP_Mobile_VehicleList {
 						~"GET /api/v1/vehicles~",
 						~"GET /api/v2/vehicles~"
 						)"))))):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~"
-                            )
-						)
-					,entityName.in(
-					    ~"GET /api/v1/vehicles~",
-						~"GET /api/v2/vehicles~"
-						)"))))):splitBy()))
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Vehicle_Login.tf b/CN_PROD/slo/TP_Vehicle_Login.tf
index ed77e03..6baa138 100644
--- a/CN_PROD/slo/TP_Vehicle_Login.tf
+++ b/CN_PROD/slo/TP_Vehicle_Login.tf
@@ -12,7 +12,7 @@ module TP_Vehicle_Login {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"TokenResource - cac - prod~",
@@ -24,20 +24,6 @@ module TP_Vehicle_Login {
                         ~"POST authorize device_code~",
 						~"validateUser~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-                                ~"TokenResource - cac - prod~",
-								~"CredentialInfoResource - cac - prod~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"POST authorize password~",
-                        ~"POST authorize device_code~",
-						~"validateUser~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Vehicle_Personalization.tf b/CN_PROD/slo/TP_Vehicle_Personalization.tf
index c1f937f..835ca15 100644
--- a/CN_PROD/slo/TP_Vehicle_Personalization.tf
+++ b/CN_PROD/slo/TP_Vehicle_Personalization.tf
@@ -12,7 +12,7 @@ module TP_Vehicle_Personalization {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"Perseus (/service) - cub-personalization - prod~"
@@ -23,19 +23,6 @@ module TP_Vehicle_Personalization {
                         ~"PUT /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
 						~"createAssociationForGcidAndVin~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-								~"Perseus (/service) - cub-personalization - prod~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
-                        ~"PUT /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
-						~"createAssociationForGcidAndVin~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Vehicle_Provisioning.tf b/CN_PROD/slo/TP_Vehicle_Provisioning.tf
index eb46d46..804b99a 100644
--- a/CN_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/CN_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -14,7 +14,7 @@ module TP_Vehicle_Provisioning {
             
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 fromRelationship.isServiceMethodOfService(
 type(~"SERVICE~"),entityName.in(
 ~"WorkshopProvisioningService - provisioning - prod~",
@@ -59,52 +59,7 @@ type(~"SERVICE~"),entityName.in(
 ~"getNOPProvisioningDataForVehicle~",
 ~"acknowledgeNOPProvisioningDownload~",
 ~"getNOPProvisioningDataForVehicleBase64~"
-)"))))):splitBy())/(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-fromRelationship.isServiceMethodOfService(
- type(~"SERVICE~"),entityName.in(
-~"WorkshopProvisioningService - provisioning - prod~",
-~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"VpsJoynrApi - provisioning - prod~",
-~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
-~"ProvisioningService - provisioning - prod~",
-~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"WorkshopProvisioningService - vps-prov - cn~",
-~"MQSession$FacadeMessageListener - vps-prov - cn~",
-~"MQSession$FacadeMessageListener - vps-trigger - cn~",
-~"VpsJoynrApi - vps-prov - cn~",
-~"MQSession$FacadeMessageListener - noptrigger - prod~",
-~"ProvisioningService - nopprov - prod~",
-~"NOP-Provisioning (/nop-prov) - nopprov - prod~"))
-,entityName.in(
-~"vpsObtainProvisioningSync~",
-~"Queue: PROV_TRIGGER_ACK-prod~",
-~"Queue: PROV_TRIGGER_INTERNAL-prod~",
-~"Queue: PROV_Trigger_IN-prod~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-~"Queue: NOP_ARCHIVE_IN-prod~",
-~"Queue: NOP_Trigger_IN-prod~",
-~"Queue: NOP_TRIGGER_ACK-prod~",
-~"Queue: NOP_TRIGGER_INTERNAL-prod~",
-~"getNOPProvisioningDataForVehicle~",
-~"acknowledgeNOPProvisioningDownload~",
-~"getNOPProvisioningDataForVehicleBase64~",
-~"/nop-prov/v2/mainprov/prov.do~",
-~"vpsObtainProvisioningSync~",
-~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
-~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
-~"getNOPProvisioningDataForVehicle~",
-~"acknowledgeNOPProvisioningDownload~",
-~"getNOPProvisioningDataForVehicleBase64~"
-)"))))):splitBy()))
+)"))))):splitBy())
 EOT
  
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/CN_PROD/slo/TP_Vehicle_RSU.tf b/CN_PROD/slo/TP_Vehicle_RSU.tf
index 1de5ab9..b614b2e 100644
--- a/CN_PROD/slo/TP_Vehicle_RSU.tf
+++ b/CN_PROD/slo/TP_Vehicle_RSU.tf
@@ -16,7 +16,7 @@ module TP_Vehicle_RSU {
 
     #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),
+        (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                         ~"UpdateRequestResource - rsu - prod~",
@@ -38,29 +38,6 @@ module TP_Vehicle_RSU {
                                 ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
                                 ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
                                 )"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-			fromRelationship.isServiceMethodOfService(
-				type(~"SERVICE~"),entityName.in(
-                                        ~"UpdateRequestResource - rsu - prod~",
-                                        ~"UpdateManifestResource - rsu - prod~",
-                                        ~"SendReportResource - rsu - prod~",
-                                        ~"MessageEndpointProxy - rsu - prod~"
-                                )
-			)
-			,entityName.in(
-				~"askForUpdate~",
-                                ~"askForUpdateManifest~",
-                                ~"sendReport~",
-                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
-                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
-                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
-                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
-                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
-                                ~"Queue: BMW.RSU.RSA_PIPELINE~",
-                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
-                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
-                                )"))))):splitBy()))
     EOT
  
 
diff --git a/CN_PROD/slo/TP_Vehicle_SmartParking.tf b/CN_PROD/slo/TP_Vehicle_SmartParking.tf
index 55aa5e6..6342863 100644
--- a/CN_PROD/slo/TP_Vehicle_SmartParking.tf
+++ b/CN_PROD/slo/TP_Vehicle_SmartParking.tf
@@ -15,13 +15,7 @@ module TP_Vehicle_SmartParking {
 
     #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),
-        entityName.in(
-                ~"/sppid7/parkingfinder/v1/EstimatedTimeArrival/getETA~",
-                ~"/parkingfinder/v2.0/getParkingLots~"
-            )")))):splitBy())
-    /
-    (builtin:service.keyRequest.count.server:filter(and(in("dt.entity.service_method",entitySelector("type(service_method),
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method),
         entityName.in(
                 ~"/sppid7/parkingfinder/v1/EstimatedTimeArrival/getETA~",
                 ~"/parkingfinder/v2.0/getParkingLots~"
diff --git a/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf b/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf
index eee69c9..cd8b6bc 100644
--- a/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf
+++ b/CN_PROD/slo/TP_Vehicle_SmartRefuel.tf
@@ -15,8 +15,8 @@ module TP_Vehicle_SmartRefuel {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-    (100)*(
-          (builtin:service.keyRequest.errors.server.successCount:filter(
+    (100)-
+          (builtin:service.keyRequest.errors.server.rate:filter(
                and(
                        or(
                                in(
@@ -32,23 +32,6 @@ module TP_Vehicle_SmartRefuel {
                                                )")
                                        )
            ))):splitBy():sum:auto:sort(value(sum,descending)))
-           /
-           (builtin:service.keyRequest.count.server:filter(
-               and(
-                       or(
-                               in(
-                                       "dt.entity.service_method",
-                                       entitySelector("type(service_method),
-                                       fromRelationship.isServiceMethodOfService(
-                                               type(~"SERVICE~"),entityName.contains(~"omcsmtrflce20q3~"),mzName(~"CN_OMC_PROD~")
-                                       )
-                                       ,entityName.in(
-                                               ~"/smtrfl/api/v1/order~",
-                                               ~"/smtrfl/api/v1/station/list~",
-                                               ~"/smtrfl/api/v1/station/detail~"
-                                               )")
-                                       )
-           ))):splitBy():sum:auto:sort(value(sum,descending))))
 EOT
  
 
diff --git a/CN_PROD/slo/VCIS_CDR_SendToCarResource_Requests.tf b/CN_PROD/slo/VCIS_CDR_SendToCarResource_Requests.tf
index 40697c1..ccc496a 100644
--- a/CN_PROD/slo/VCIS_CDR_SendToCarResource_Requests.tf
+++ b/CN_PROD/slo/VCIS_CDR_SendToCarResource_Requests.tf
@@ -12,20 +12,12 @@ module VCIS_CDR_SendToCarResource_Requests {
 
     #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
+(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(~"SendToCarResource - information~"), tag(~"Environment:PROD~")),
         entityName.in(~"sendMessagesToVehicles~")")))))
         :splitBy())
-/
-(builtin:service.keyRequest.count.server:filter(and(or
-        (in("dt.entity.service_method",entitySelector("type(service_method),fromRelationship.isServiceMethodOfService(type(~"SERVICE~"),
-        entityName.in(~"SendToCarResource - information~"), tag(~"Environment:PROD~")),
-        entityName.in(~"sendMessagesToVehicles~")")))))
-        :splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf b/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf
index b7693c2..9cd602a 100644
--- a/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf
+++ b/EMEA_PROD/slo/TP_Mobile_DigitalKey.tf
@@ -12,7 +12,7 @@ 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),
+(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(
                                          ~"TrackApi - smc - PROD~",
@@ -24,21 +24,7 @@ module TP_Mobile_DigitalKey {
 				~"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~"
-                                  )
-				)
-			,entityName.in(
-				~"trackKey~",
-				~"manageKey~",
-				~"GET /api/v1/digitalkey/<VIN>/password~",
-                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-			)"))))):splitBy()))					
+			)"))))):splitBy())			
     EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Mobile_Mapping.tf b/EMEA_PROD/slo/TP_Mobile_Mapping.tf
index 32f40f6..3a21718 100644
--- a/EMEA_PROD/slo/TP_Mobile_Mapping.tf
+++ b/EMEA_PROD/slo/TP_Mobile_Mapping.tf
@@ -12,8 +12,7 @@ module TP_Mobile_Mapping {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(
     and(
         or(
             in(
@@ -42,36 +41,6 @@ module TP_Mobile_Mapping {
                         )")
                 )
 ))):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~",
-                                ~"vehicle-mapping-composite-service - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v2/presentation/users/validate~",
-                        ~"POST /api/v2/vehicles/<VIN>/primary~",
-                        ~"POST /api/v2/vehicles/<VIN>/primary/map~",
-                        ~"POST /api/v1/vehicles/<VIN>/validate-security-code~",
-                        ~"POST /api/v1/vehicles/<VIN>/resend-security-code~",
-                        ~"DELETE /api/v1/vehicles/<VIN>~",
-                        ~"POST /api/v3/mappings/create~",
-                        ~"POST /api/v3/mappings/continue~",
-                        ~"POST /api/v3/mappings/validate-security-code~",
-                        ~"POST /api/v3/mappings/resend-security-code~",
-                        ~"GET /api/v3/images/<image>~",
-                        ~"DELETE /api/v3/mappings~"
-                        )")
-                )
-))):splitBy()))
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf b/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf
index 34dc634..bd99d7b 100644
--- a/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf
+++ b/EMEA_PROD/slo/TP_Mobile_PersonalFavorites.tf
@@ -12,7 +12,7 @@ module TP_Mobile_PersonalFavorites {
 
     #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),
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
 			        type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -29,25 +29,6 @@ module TP_Mobile_PersonalFavorites {
 					~"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~"
-					)
-				)
-			,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" 
diff --git a/EMEA_PROD/slo/TP_Mobile_RSU.tf b/EMEA_PROD/slo/TP_Mobile_RSU.tf
index 2c13bac..bab50ee 100644
--- a/EMEA_PROD/slo/TP_Mobile_RSU.tf
+++ b/EMEA_PROD/slo/TP_Mobile_RSU.tf
@@ -12,7 +12,7 @@ module TP_Mobile_RSU {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"RemoteSoftwareUpgrade.WebApp - PROD~"
@@ -23,19 +23,6 @@ module TP_Mobile_RSU {
                         ~"POST /v2/vehicle/rsustatus/preparationCompleted~",
 						~"POST /v2/vehicle/rsustatus/updateAvailable~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-								~"RemoteSoftwareUpgrade.WebApp - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"POST /v2/vehicle/rsustatus/finishInstallation~",
-                        ~"POST /v2/vehicle/rsustatus/preparationCompleted~",
-						~"POST /v2/vehicle/rsustatus/updateAvailable~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf b/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
index 2910605..8744b57 100644
--- a/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
+++ b/EMEA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
@@ -12,18 +12,12 @@ module TP_Mobile_Send2VehicleLegacy {
 
     #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",
+        (100)-(builtin:service.errors.server.rate: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" 
diff --git a/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf b/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
index b24d30e..b14647a 100644
--- a/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
+++ b/EMEA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
@@ -12,7 +12,7 @@ module TP_Mobile_Send2VehicleMGU {
 
     #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),
+        (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -22,17 +22,6 @@ module TP_Mobile_Send2VehicleMGU {
                                         ~"/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~"
-                                        )
-				)
-				,entityName.in(
-					~"/v2/motorist/[UUID]/trips~",
-                                        ~"/v3/motorist/[UUID]/trips~"
-                                        )"))))):splitBy()))
     EOT 
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Mobile_VehicleList.tf b/EMEA_PROD/slo/TP_Mobile_VehicleList.tf
index 8eb1b6e..e2472ae 100644
--- a/EMEA_PROD/slo/TP_Mobile_VehicleList.tf
+++ b/EMEA_PROD/slo/TP_Mobile_VehicleList.tf
@@ -12,7 +12,7 @@ module TP_Mobile_VehicleList {
 
     #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",
+	(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",
 					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
@@ -23,18 +23,6 @@ module TP_Mobile_VehicleList {
 						~"GET /api/v2/vehicles~",
                         ~"GET /api/v4/vehicles~"
 						)"))))):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~"
-                            )
-						)
-					,entityName.in(
-					    ~"GET /api/v2/vehicles~",
-                        ~"GET /api/v4/vehicles~"
-						)"))))):splitBy()))
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Vehicle_Login.tf b/EMEA_PROD/slo/TP_Vehicle_Login.tf
index ed77e03..6baa138 100644
--- a/EMEA_PROD/slo/TP_Vehicle_Login.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_Login.tf
@@ -12,7 +12,7 @@ module TP_Vehicle_Login {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"TokenResource - cac - prod~",
@@ -24,20 +24,6 @@ module TP_Vehicle_Login {
                         ~"POST authorize device_code~",
 						~"validateUser~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-                                ~"TokenResource - cac - prod~",
-								~"CredentialInfoResource - cac - prod~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"POST authorize password~",
-                        ~"POST authorize device_code~",
-						~"validateUser~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Vehicle_Personalization.tf b/EMEA_PROD/slo/TP_Vehicle_Personalization.tf
index c1f937f..835ca15 100644
--- a/EMEA_PROD/slo/TP_Vehicle_Personalization.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_Personalization.tf
@@ -12,7 +12,7 @@ module TP_Vehicle_Personalization {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"Perseus (/service) - cub-personalization - prod~"
@@ -23,19 +23,6 @@ module TP_Vehicle_Personalization {
                         ~"PUT /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
 						~"createAssociationForGcidAndVin~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-								~"Perseus (/service) - cub-personalization - prod~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
-                        ~"PUT /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
-						~"createAssociationForGcidAndVin~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf b/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf
index 423a851..5b321e8 100644
--- a/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -15,7 +15,7 @@ module TP_Vehicle_Provisioning {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 fromRelationship.isServiceMethodOfService(
 type(~"SERVICE~"),entityName.in(
 ~"WorkshopProvisioningService - provisioning - prod~",
@@ -60,52 +60,7 @@ type(~"SERVICE~"),entityName.in(
 ~"Queue: NOP_Trigger_IN-prod~",
 ~"Queue: NOP_TRIGGER_ACK-prod~",
 ~"Queue: NOP_TRIGGER_INTERNAL-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(
-~"WorkshopProvisioningService - provisioning - prod~",
-~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"VpsJoynrApi - provisioning - prod~",
-~"WorkshopProvisioningService - vps-prov - prod~",
-~"MQSession$FacadeMessageListener - vps-prov - prod~",
-~"MQSession$FacadeMessageListener - vps-trigger - prod~",
-~"MQSession$FacadeMessageListener - vps-trigger - prod~",
-~"VpsJoynrApi - vps-prov - prod~",
-~"MQSession$FacadeMessageListener - noptrigger - prod~",
-~"ProvisioningService - nopprov - prod~",
-~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
-~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvisioningService - provisioning - prod~",
-~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
-,entityName.in(
-~"vpsObtainProvisioningSync~",
-~"Queue: PROV_TRIGGER_ACK-prod~",
-~"Queue: PROV_TRIGGER_INTERNAL-prod~",
-~"Queue: PROV_Trigger_IN-prod~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"vpsObtainProvisioningSync~",
-~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
-~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
-~"Queue: B2VPROD.BMW.CASA_EMEA.NOP_OUT~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
-~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
-~"getNOPProvisioningDataForVehicle~",
-~"getNOPProvisioningDataForVehicleBase64~",
-~"acknowledgeNOPProvisioningDownload~",
-~"/nop-prov/v2/mainprov/prov.do~",
-~"Queue: NOP_ARCHIVE_IN-prod~",
-~"Queue: NOP_Trigger_IN-prod~",
-~"Queue: NOP_TRIGGER_ACK-prod~",
-~"Queue: NOP_TRIGGER_INTERNAL-prod~"
-)"))))):splitBy()))
+)"))))):splitBy())
 EOT 
 
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/TP_Vehicle_RSU.tf b/EMEA_PROD/slo/TP_Vehicle_RSU.tf
index aad5cf6..d2950ee 100644
--- a/EMEA_PROD/slo/TP_Vehicle_RSU.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_RSU.tf
@@ -14,7 +14,7 @@ module TP_Vehicle_RSU {
 
     #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),
+        (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                         ~"UpdateRequestResource - rsu - prod~",
@@ -36,29 +36,6 @@ module TP_Vehicle_RSU {
                                 ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
                                 ~"Queue: BMW.RSU.RSA_PIPELINE~"
                                 )"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-		        fromRelationship.isServiceMethodOfService(
-			        type(~"SERVICE~"),entityName.in(
-                                        ~"UpdateRequestResource - rsu - prod~",
-                                        ~"UpdateManifestResource - rsu - prod~",
-                                        ~"SendReportResource~",
-                                        ~"MessageEndpointProxy - rsu - prod~"
-                                )
-			)
-			,entityName.in(
-				~"askForUpdate~",
-                                ~"askForUpdateManifest~",
-                                ~"sendReport~",
-                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
-                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
-                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
-                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
-                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
-                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
-                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
-                                ~"Queue: BMW.RSU.RSA_PIPELINE~"
-				)"))))):splitBy()))
     EOT 
  
 
diff --git a/NA_PROD/slo/TP_Mobile_DigitalKey.tf b/NA_PROD/slo/TP_Mobile_DigitalKey.tf
index b7693c2..9cd602a 100644
--- a/NA_PROD/slo/TP_Mobile_DigitalKey.tf
+++ b/NA_PROD/slo/TP_Mobile_DigitalKey.tf
@@ -12,7 +12,7 @@ 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),
+(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(
                                          ~"TrackApi - smc - PROD~",
@@ -24,21 +24,7 @@ module TP_Mobile_DigitalKey {
 				~"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~"
-                                  )
-				)
-			,entityName.in(
-				~"trackKey~",
-				~"manageKey~",
-				~"GET /api/v1/digitalkey/<VIN>/password~",
-                                ~"GET /api/v1/digitalkey/<VIN>/pairing~"
-			)"))))):splitBy()))					
+			)"))))):splitBy())			
     EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Mobile_Mapping.tf b/NA_PROD/slo/TP_Mobile_Mapping.tf
index 1b7aaf6..600a532 100644
--- a/NA_PROD/slo/TP_Mobile_Mapping.tf
+++ b/NA_PROD/slo/TP_Mobile_Mapping.tf
@@ -12,8 +12,7 @@ module TP_Mobile_Mapping {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)*
-((builtin:service.keyRequest.errors.server.successCount:filter(
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(
     and(
         or(
             in(
@@ -43,37 +42,6 @@ module TP_Mobile_Mapping {
                         )")
                 )
 ))):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~",
-                                ~"vehicle-mapping-composite-service - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /api/v2/presentation/users/validate~",
-                        ~"POST /api/v2/vehicles/<VIN>/primary~",
-                        ~"POST /api/v2/vehicles/<VIN>/primary/map~",
-                        ~"POST /api/v1/vehicles/<VIN>/validate-security-code~",
-                        ~"POST /api/v1/vehicles/<VIN>/resend-security-code~",
-                        ~"DELETE /api/v1/vehicles/<VIN>~",
-                        ~"POST /api/v3/mappings/create~",
-                        ~"POST /api/v3/mappings/continue~",
-                        ~"POST /api/v3/mappings/validate-security-code~",
-                        ~"POST /api/v3/mappings/resend-security-code~",
-                        ~"GET /api/v3/images/<image>~",
-                        ~"DELETE /api/v3/mappings~",
-                        ~"POST /api/v2/vehicles/<VIN>/secondary~"
-                        )")
-                )
-))):splitBy()))
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf b/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf
index c6e7f24..1e14182 100644
--- a/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf
+++ b/NA_PROD/slo/TP_Mobile_PersonalFavorites.tf
@@ -12,7 +12,7 @@ module TP_Mobile_PersonalFavorites {
 
     #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),
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
 			        type(~"SERVICE~"),entityName.in(
 					~"btc-destination-composite-service - PROD~"
@@ -27,23 +27,6 @@ module TP_Mobile_PersonalFavorites {
 					~"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~"
-					)
-				)
-			,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" 
diff --git a/NA_PROD/slo/TP_Mobile_RSU.tf b/NA_PROD/slo/TP_Mobile_RSU.tf
index 2c13bac..bab50ee 100644
--- a/NA_PROD/slo/TP_Mobile_RSU.tf
+++ b/NA_PROD/slo/TP_Mobile_RSU.tf
@@ -12,7 +12,7 @@ module TP_Mobile_RSU {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"RemoteSoftwareUpgrade.WebApp - PROD~"
@@ -23,19 +23,6 @@ module TP_Mobile_RSU {
                         ~"POST /v2/vehicle/rsustatus/preparationCompleted~",
 						~"POST /v2/vehicle/rsustatus/updateAvailable~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-								~"RemoteSoftwareUpgrade.WebApp - PROD~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"POST /v2/vehicle/rsustatus/finishInstallation~",
-                        ~"POST /v2/vehicle/rsustatus/preparationCompleted~",
-						~"POST /v2/vehicle/rsustatus/updateAvailable~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf b/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
index 2910605..8744b57 100644
--- a/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
+++ b/NA_PROD/slo/TP_Mobile_Send2VehicleLegacy.tf
@@ -12,18 +12,12 @@ module TP_Mobile_Send2VehicleLegacy {
 
     #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",
+        (100)-(builtin:service.errors.server.rate: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" 
diff --git a/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf b/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
index 7e6dc2d..3c84c78 100644
--- a/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
+++ b/NA_PROD/slo/TP_Mobile_Send2VehicleMGU.tf
@@ -12,7 +12,7 @@ module TP_Mobile_Send2VehicleMGU {
 
     #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),
+        (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 				fromRelationship.isServiceMethodOfService(
 					type(~"SERVICE~"),entityName.in(
                                                 ~"TripService - PROD~"
@@ -22,17 +22,6 @@ module TP_Mobile_Send2VehicleMGU {
                                         ~"/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~"
-                                        )
-				)
-				,entityName.in(
-					~"/v2/motorist/[UUID]/trips~",
-                                        ~"/v3/motorist/[UUID]/trips~"
-                                        )"))))):splitBy()))
     EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Mobile_VehicleList.tf b/NA_PROD/slo/TP_Mobile_VehicleList.tf
index d9e64cd..d705a18 100644
--- a/NA_PROD/slo/TP_Mobile_VehicleList.tf
+++ b/NA_PROD/slo/TP_Mobile_VehicleList.tf
@@ -12,7 +12,7 @@ module TP_Mobile_VehicleList {
 
     #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",
+  	(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",
 					entitySelector("type(service_method),
 						fromRelationship.isServiceMethodOfService(
 							type(~"SERVICE~"),entityName.in(
@@ -23,18 +23,6 @@ module TP_Mobile_VehicleList {
 						~"GET /api/v2/vehicles~",
 						~"GET /api/v4/vehicles~"
 						)"))))):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~"
-                            )
-						)
-					,entityName.in(
-					    ~"GET /api/v2/vehicles~",
-						~"GET /api/v4/vehicles~"
-						)"))))):splitBy()))
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Vehicle_Login.tf b/NA_PROD/slo/TP_Vehicle_Login.tf
index ed77e03..6baa138 100644
--- a/NA_PROD/slo/TP_Vehicle_Login.tf
+++ b/NA_PROD/slo/TP_Vehicle_Login.tf
@@ -12,7 +12,7 @@ module TP_Vehicle_Login {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"TokenResource - cac - prod~",
@@ -24,20 +24,6 @@ module TP_Vehicle_Login {
                         ~"POST authorize device_code~",
 						~"validateUser~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-                                ~"TokenResource - cac - prod~",
-								~"CredentialInfoResource - cac - prod~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"POST authorize password~",
-                        ~"POST authorize device_code~",
-						~"validateUser~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Vehicle_Personalization.tf b/NA_PROD/slo/TP_Vehicle_Personalization.tf
index c1f937f..835ca15 100644
--- a/NA_PROD/slo/TP_Vehicle_Personalization.tf
+++ b/NA_PROD/slo/TP_Vehicle_Personalization.tf
@@ -12,7 +12,7 @@ module TP_Vehicle_Personalization {
 
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
                                 ~"Perseus (/service) - cub-personalization - prod~"
@@ -23,19 +23,6 @@ module TP_Vehicle_Personalization {
                         ~"PUT /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
 						~"createAssociationForGcidAndVin~"
                         )"))))):splitBy())
-		/
-		(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-                        fromRelationship.isServiceMethodOfService(
-                            type(~"SERVICE~"),entityName.in(
-								~"Perseus (/service) - cub-personalization - prod~"
-                                )
-                        )
-                    ,entityName.in(
-                        ~"GET /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
-                        ~"PUT /service/api/vehicle/v1/gcid/[UUID]/vin/<VIN>/pds~",
-						~"createAssociationForGcidAndVin~"
-                        )"))))):splitBy()))
-
 EOT
 
 #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Vehicle_Provisioning.tf b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
index 5058a7e..310764c 100644
--- a/NA_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -14,7 +14,7 @@ module TP_Vehicle_Provisioning {
             
     #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),
+(100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 fromRelationship.isServiceMethodOfService(
 type(~"SERVICE~"),entityName.in(
 ~"WorkshopProvisioningService - provisioning - prod~",
@@ -57,50 +57,7 @@ type(~"SERVICE~"),entityName.in(
 ~"Queue: NOP_Trigger_IN-prod~",
 ~"Queue: NOP_TRIGGER_ACK-prod~",
 ~"Queue: NOP_TRIGGER_INTERNAL-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(
-~"WorkshopProvisioningService - provisioning - prod~",
-~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"VpsJoynrApi - provisioning - prod~",
-~"WorkshopProvisioningService - vps-prov - us~",
-~"MQSession$FacadeMessageListener - vps-prov - us~",
-~"MQSession$FacadeMessageListener - vps-trigger - us~",
-~"VpsJoynrApi - vps-prov - us~",
-~"MQSession$FacadeMessageListener - noptrigger - prod~",
-~"ProvisioningService - nopprov - prod~",
-~"NOP-Provisioning (/nop-prov) - nopprov - prod~",
-~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-~"ProvisioningService - provisioning - prod~",
-~"NOP-Provisioning (/nop-prov) - provisioning - prod~"))
-,entityName.in(
-~"vpsObtainProvisioningSync~",
-~"Queue: PROV_TRIGGER_ACK-prod~",
-~"Queue: PROV_TRIGGER_INTERNAL-prod~",
-~"Queue: PROV_Trigger_IN-prod~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-~"vpsObtainProvisioningSync~",
-~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
-~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
-~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
-~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
-~"getNOPProvisioningDataForVehicle~",
-~"acknowledgeNOPProvisioningDownload~",
-~"getNOPProvisioningDataForVehicleBase64~",
-~"/nop-prov/v2/mainprov/prov.do~",
-~"Queue: NOP_ARCHIVE_IN-prod~",
-~"Queue: NOP_Trigger_IN-prod~",
-~"Queue: NOP_TRIGGER_ACK-prod~",
-~"Queue: NOP_TRIGGER_INTERNAL-prod~"
-)"))))):splitBy()))
+)"))))):splitBy())
 EOT 
 
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/TP_Vehicle_RSU.tf b/NA_PROD/slo/TP_Vehicle_RSU.tf
index 8564850..f7fa9f3 100644
--- a/NA_PROD/slo/TP_Vehicle_RSU.tf
+++ b/NA_PROD/slo/TP_Vehicle_RSU.tf
@@ -15,7 +15,7 @@ module TP_Vehicle_RSU {
 
     #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),
+        (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
                                         ~"UpdateRequestResource - rsu - prod~",
@@ -37,29 +37,6 @@ module TP_Vehicle_RSU {
                                 ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
                                 ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
                                 )"))))):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-		        fromRelationship.isServiceMethodOfService(
-			        type(~"SERVICE~"),entityName.in(
-                                        ~"UpdateRequestResource - rsu - prod~",
-                                        ~"UpdateManifestResource - rsu - prod~",
-                                        ~"SendReportResource - rsu - prod~",
-                                        ~"MessageEndpointProxy - rsu - prod~"
-                                )
-			)
-			,entityName.in(
-				~"askForUpdate~",
-                                ~"askForUpdateManifest~",
-                                ~"sendReport~",
-                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
-                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
-                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
-                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
-                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
-                                ~"Queue: BMW.RSU.RSA_PIPELINE~",
-                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
-                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
-                                )"))))):splitBy()))
     EOT