diff --git a/src/captcha/captcha-challenge.service.ts b/src/captcha/captcha-challenge.service.ts
index 3a6c6be..0145635 100644
--- a/src/captcha/captcha-challenge.service.ts
+++ b/src/captcha/captcha-challenge.service.ts
@@ -35,7 +35,7 @@ export class CaptchaChallengeService {
 
     return {
       captchaId,
-      text: generated.text,
+      text: generated.text, /* TODO: REMOVE THIS FOR PROD*/
       image: generated.image,
       expiresAt: generated.expiresAt,
     };
diff --git a/src/expert-blame/expert-blame.service.ts b/src/expert-blame/expert-blame.service.ts
index ad27fbd..95beb42 100644
--- a/src/expert-blame/expert-blame.service.ts
+++ b/src/expert-blame/expert-blame.service.ts
@@ -279,6 +279,11 @@ export class ExpertBlameService {
       buckets.all++;
       buckets[key] = (buckets[key] ?? 0) + 1;
     }
+
+    // Adding extra fields for front-end
+    buckets["PENDING_ON_USER"] = buckets[CaseStatus.WAITING_FOR_DOCUMENT_RESEND] + buckets[CaseStatus.WAITING_FOR_SIGNATURES];
+    buckets["CHECK_NEEDED"] = buckets["PENDING_ON_USER"] + buckets[CaseStatus.WAITING_FOR_EXPERT];
+
     return buckets;
   }
 
diff --git a/src/expert-claim/expert-claim.service.ts b/src/expert-claim/expert-claim.service.ts
index be10a07..c9295c9 100644
--- a/src/expert-claim/expert-claim.service.ts
+++ b/src/expert-claim/expert-claim.service.ts
@@ -3195,6 +3195,11 @@ export class ExpertClaimService {
       buckets.all++;
       buckets[key] = (buckets[key] ?? 0) + 1;
     }
+    
+    // Add new calculated fields for front-end
+    buckets["PENDING_ON_USER"] = buckets[ClaimCaseStatus.WAITING_FOR_USER_RESEND] + buckets[ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL] + buckets[ClaimCaseStatus.INSURER_REVIEW_AWAITING_OWNER_SIGN] + buckets[ClaimCaseStatus.INSURER_REVIEW_MIXED_FACTORS_PENDING] + buckets[ClaimCaseStatus.OWNER_REPAIR_FACTOR_UPLOAD_PENDING];
+    buckets["CHECK_NEEDED"] = buckets["PENDING_ON_USER"] + buckets[ClaimCaseStatus.WAITING_FOR_DAMAGE_EXPERT]
+
     return buckets;
   }
 
diff --git a/src/helpers/expert-panel-status-report.ts b/src/helpers/expert-panel-status-report.ts
index aa13797..f8b5e63 100644
--- a/src/helpers/expert-panel-status-report.ts
+++ b/src/helpers/expert-panel-status-report.ts
@@ -3,8 +3,8 @@ import { ClaimCaseStatus } from "src/Types&Enums/claim-request-management/claim-
 
 /** Blame: early workflow before expert queue / resend / signatures / terminals. */
 const BLAME_IN_PROGRESS_STATUSES = new Set<string>([
-  CaseStatus.OPEN,
-  CaseStatus.WAITING_FOR_SECOND_PARTY,
+  // CaseStatus.OPEN,
+  // CaseStatus.WAITING_FOR_SECOND_PARTY,
 ]);
 
 /**