diff --git a/.gitignore b/.gitignore
index 91ed41ba..fc71b80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ lerna-debug.log*
 # OS
 .DS_Store
 
+
 # Tests
 /coverage
 /.nyc_output
diff --git a/src/care-treatment/current-on-art/queries/handlers/get-ahd-screening.handler.ts b/src/care-treatment/current-on-art/queries/handlers/get-ahd-screening.handler.ts
index 59a04b8d..0b1bd153 100644
--- a/src/care-treatment/current-on-art/queries/handlers/get-ahd-screening.handler.ts
+++ b/src/care-treatment/current-on-art/queries/handlers/get-ahd-screening.handler.ts
@@ -23,8 +23,7 @@ export class GetAhdScreeningHandler implements IQueryHandler<GetAhdScreeningQuer
                 SUM(CD4Lessthan200) AS less200CD4,
                 SUM(DoneTBLamTest) AS DoneTBLamTest,
                 SUM(TBLamPositive) AS TBLamPositive,
-                --SUM(OntbTreatment) AS tbInitiated,
-                0 AS tbInitiated,
+                SUM(TBLamPosonTBRx) AS tbInitiated,
                 SUM(DoneCrAgTest) AS DoneCrAgTest,
                 SUM(CrAgPositive) AS CrAgPositive,
                 SUM(CSFCrAg) AS CSFCrAg,
diff --git a/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts b/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts
index 6e8667bc..97cac7ce 100644
--- a/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts
+++ b/src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts
@@ -21,7 +21,8 @@ export class GetCtViralLoadCascadeActiveArtClientsHandler implements IQueryHandl
                 SUM(CASE WHEN ValidVLResultCategory2 = 'High Risk LLV ' THEN 1 END) HighRisk, 
                 SUM(CASE WHEN ValidVLResultCategory2 = 'LDL' THEN 1 END) LDL, 
                 SUM(CASE WHEN ValidVLResultCategory2 = 'Low Risk LLV' THEN 1 END) LowRisk, 
-                SUM(CASE WHEN ValidVLResultCategory2 = 'UNSUPPRESSED' THEN 1 END) Unsuppressed
+                SUM(CASE WHEN ValidVLResultCategory2 = 'UNSUPPRESSED' THEN 1 END) Unsuppressed,
+                EndofMonthDate
                 `,
             ])
             .where('f.[ISTxCurr] > 0');
@@ -61,6 +62,7 @@ export class GetCtViralLoadCascadeActiveArtClientsHandler implements IQueryHandl
         }
 
         return await viralLoadCascade
+            .groupBy('EndofMonthDate')
             .getRawOne();
     }
 }