diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
index 5bc67aa0..1d4ec078 100644
--- a/claimManagement/build.gradle
+++ b/claimManagement/build.gradle
@@ -21,6 +21,7 @@ repositories {
 android {
     compileSdkVersion 32
     buildToolsVersion '33.0.0'
+    namespace 'org.openimis.imisclaims'
 
     defaultConfig {
         applicationId "org.openimis.imisclaims"
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/Report.java b/claimManagement/src/main/java/org/openimis/imisclaims/Report.java
index f6eb1b5c..7370d787 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/Report.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/Report.java
@@ -5,6 +5,8 @@
 import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
+import org.json.JSONObject;
+
 import java.io.File;
 
 public class Report extends ImisActivity {
@@ -38,6 +40,8 @@ protected void onCreate(Bundle savedInstanceState) {
         File pendingFolder = new File(PendingFolder);
         File trashFolder = new File(TrashFolder);
 
+        JSONObject counts = sqlHandler.getClaimCounts();
+
         int countAccepted = 0;
         int countRejected = 0;
         if (acceptedClaims.listFiles().length > 0) {
@@ -54,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
             }
         } else {
-            countAccepted = 0;
+            countAccepted = counts.optInt(SQLHandler.CLAIM_UPLOAD_STATUS_ACCEPTED, 0);;
         }
 
         if (rejectedClaims.listFiles().length > 0) {
@@ -71,7 +75,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
             }
         } else {
-            countRejected = 0;
+            countRejected = counts.optInt(SQLHandler.CLAIM_UPLOAD_STATUS_REJECTED, 0);;
         }
         //Pending & Trash
         int count_pending = 0;
@@ -90,7 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
             }
         } else {
-            count_pending = 0;
+            count_pending = counts.optInt(SQLHandler.CLAIM_UPLOAD_STATUS_ENTERED, 0);;
         }
 
         if (trashFolder.listFiles().length > 0) {
diff --git a/gradle.properties b/gradle.properties
index dbb7bf70..914be332 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,4 @@
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false