diff --git a/src/components/CostAndExpenseReport/CostAndExpenseReportWrapper.tsx b/src/components/CostAndExpenseReport/CostAndExpenseReportWrapper.tsx
index d373800..2b485bd 100644
--- a/src/components/CostAndExpenseReport/CostAndExpenseReportWrapper.tsx
+++ b/src/components/CostAndExpenseReport/CostAndExpenseReportWrapper.tsx
@@ -14,7 +14,7 @@ interface SubComponents {
 
 const CostAndExpenseReportWrapper: React.FC & SubComponents = async () => {
     const session: any = await getServerSession(authOptions)
-    const teamId = session.staff?.team.id
+    const teamId = session.staff?.teamId
     const role = session.role
     let customers = await fetchAllCustomers()
     let subsidiaries = await fetchAllSubsidiaries()
diff --git a/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReportWrapper.tsx b/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReportWrapper.tsx
index 8461512..08b0b1f 100644
--- a/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReportWrapper.tsx
+++ b/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReportWrapper.tsx
@@ -12,7 +12,7 @@ interface SubComponents {
 const GenerateMonthlyWorkHoursReportWrapper: React.FC &
   SubComponents = async () => {
   const session: any = await getServerSession(authOptions);
-  const teamId = session.staff?.team.id;
+  const teamId = session.staff?.teamId;
   const role = session.role;
   let staffs = await fetchStaff();
 
diff --git a/src/components/GenerateProjectCashFlowReport/GenerateProjectCashFlowReportWrapper.tsx b/src/components/GenerateProjectCashFlowReport/GenerateProjectCashFlowReportWrapper.tsx
index 81050e5..fc4a69b 100644
--- a/src/components/GenerateProjectCashFlowReport/GenerateProjectCashFlowReportWrapper.tsx
+++ b/src/components/GenerateProjectCashFlowReport/GenerateProjectCashFlowReportWrapper.tsx
@@ -12,7 +12,7 @@ const GenerateProjectCashFlowReportWrapper: React.FC & SubComponents = async ()
   const projects = await fetchProjects();
   const staff = await getUserStaff()
 
-  return <GenerateProjectCashFlowReport projects={projects.filter(project => project.teamId === staff.teamId)} />;
+  return <GenerateProjectCashFlowReport projects={staff?.teamId ? projects.filter(project => project.teamId === staff.teamId) : projects} />;
 };
 
 GenerateProjectCashFlowReportWrapper.Loading = GenerateProjectCashFlowReportLoading;
diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx
index a35794d..f4ba01f 100644
--- a/src/components/NavigationContent/NavigationContent.tsx
+++ b/src/components/NavigationContent/NavigationContent.tsx
@@ -182,11 +182,11 @@ const NavigationContent: React.FC<Props> = ({ abilities }) => {
         //   label: "Completion Report with Outstanding Un-billed Hours Report",
         //   path: "/analytics/ProjectCompletionReportWO",
         // },
-        {
-          icon: <Analytics />,
-          label: "Project Claims Report",
-          path: "/analytics/ProjectClaimsReport",
-        },
+        // {
+        //   icon: <Analytics />,
+        //   label: "Project Claims Report",
+        //   path: "/analytics/ProjectClaimsReport",
+        // },
         {
           icon: <Analytics />,
           label: "Project P&L Report",
diff --git a/src/components/ProjectCompletionReport/ProjectCompletionReportWrapper.tsx b/src/components/ProjectCompletionReport/ProjectCompletionReportWrapper.tsx
index 8a0e130..1a04dc3 100644
--- a/src/components/ProjectCompletionReport/ProjectCompletionReportWrapper.tsx
+++ b/src/components/ProjectCompletionReport/ProjectCompletionReportWrapper.tsx
@@ -13,7 +13,7 @@ interface SubComponents {
 
 const ProjectCompletionReportWrapper: React.FC & SubComponents = async () => {
   const session: any = await getServerSession(authOptions)
-  const teamId = session.staff?.team.id
+  const teamId = session.staff?.teamId
   const role = session.role
 
   return <ProjectCompletionReport teamId={role === TEAM_LEAD && session.staff?.team ? teamId : null}/>
diff --git a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReportWrapper.tsx b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReportWrapper.tsx
index 092301c..43b9492 100644
--- a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReportWrapper.tsx
+++ b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReportWrapper.tsx
@@ -15,9 +15,9 @@ interface SubComponents {
 const ResourceOvercomsumptionReportWrapper: React.FC &
   SubComponents = async () => {
   const session: any = await getServerSession(authOptions);
-  const teamId = session.staff?.team.id;
+  const teamId = session.staff?.teamId;
   const role = session.role;
-  let needAll = true;
+  let needAll = true; 
   let teams = await fetchTeam();
   const [customers, subsidiaries] = await Promise.all([
     fetchAllCustomers(),