diff --git a/CN_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
index 8eeb416..0cffb0a 100644
--- a/CN_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
@@ -10,11 +10,24 @@ module Wirkkette__Personal_Favorites__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-AE0CB67C57D163EA\",\"SERVICE_METHOD-970C9FB1ABE9E841\",\"SERVICE_METHOD-9F2ED8B73FE0F481\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy())" 
+    metric_expression           = <<EOT
+    (100)-(builtin:service.keyRequest.errors.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(
+                                        ~"GET /api/v3/favorites~",
+                                        ~"POST /api/v3/favorites~",
+                                        ~"PUT /api/v3/favorites/<favoriteId>~"
+                        )"))))):splitBy())
+
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/EMEA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
index 8753293..d51eeec 100644
--- a/EMEA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
@@ -10,11 +10,30 @@ module Wirkkette__Personal_Favorites__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-CBCE375553D769D2\",\"SERVICE_METHOD-9570A323C2E0FDD9\",\"SERVICE_METHOD-0AFCF8BE29009C08\",\"SERVICE_METHOD-583AB3B5F7D16CCE\",\"SERVICE_METHOD-94FE409856014A80\",\"SERVICE_METHOD-4C438DA8B8E91EEF\",\"SERVICE_METHOD-3AB17D689795945E\",\"SERVICE_METHOD-148D81E3F64105E3\",\"SERVICE_METHOD-4C438DA8B8E91EEF\",\"SERVICE_METHOD-CC5B346B1BFB9605\",\"SERVICE_METHOD-4048C0BE9439E0EF\")" 
+    filter                      = ""
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
+    metric_expression           = <<EOT
+    (100)-(builtin:service.keyRequest.errors.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" 
@@ -25,9 +44,7 @@ module Wirkkette__Personal_Favorites__-_Reliability_of_key_requests {
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98                            #if not set(removed) it's defaulted to 98
+    warning                     = 99                            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
index 457c2e2..b462d77 100644
--- a/NA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Personal_Favorites__-_Reliability_of_key_requests.tf
@@ -10,11 +10,28 @@ module Wirkkette__Personal_Favorites__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-BADABB7385650BE4\",\"SERVICE_METHOD-12B8588F9DDBDAA9\",\"SERVICE_METHOD-A0F749CDEE8730AE\",\"SERVICE_METHOD-906A6C881A9785D5\",\"SERVICE_METHOD-0E6E1517C8388E84\",\"SERVICE_METHOD-ED31F636A58B5816\",\"SERVICE_METHOD-3DDD4BD8F832EFA5\",\"SERVICE_METHOD-85FC65C4AE67C4C8\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy()))" 
+    metric_expression           = <<EOT
+    (100)-(builtin:service.keyRequest.errors.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/~",
+                                        ~"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" 
@@ -25,9 +42,7 @@ module Wirkkette__Personal_Favorites__-_Reliability_of_key_requests {
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98                            #if not set(removed) it's defaulted to 98
+    warning                     = 99                            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file