diff --git a/src/layouts/config.js b/src/layouts/config.js
index 7dceb0c4cf65..d9685ba29de4 100644
--- a/src/layouts/config.js
+++ b/src/layouts/config.js
@@ -424,14 +424,14 @@ export const nativeMenuItems = [
           { title: "Message Viewer", path: "/email/tools/message-viewer" },
         ],
       },
-      // {
-      //   title: "Dark Web Tools",
-      //   path: "/tools/darkweb",
-      //   items: [
-      //     { title: "Tenant Breach Lookup", path: "/tools/tenantbreachlookup" },
-      //     { title: "Breach Lookup", path: "/tools/breachlookup" },
-      //   ],
-      // },
+      {
+        title: "Dark Web Tools",
+        path: "/tools/darkweb",
+        items: [
+          { title: "Tenant Breach Lookup", path: "/tools/tenantbreachlookup" },
+          { title: "Breach Lookup", path: "/tools/breachlookup" },
+        ],
+      },
       {
         title: "Template Library",
         path: "/tools/templatelib",
@@ -476,7 +476,7 @@ export const nativeMenuItems = [
             title: "Table Maintenance",
             path: "/cipp/advanced/table-maintenance",
             roles: ["superadmin"],
-          }
+          },
         ],
       },
     ],
diff --git a/src/pages/tenant/standards/bpa-report/view.js b/src/pages/tenant/standards/bpa-report/view.js
index b7db6c926e4e..2760fdc0a446 100644
--- a/src/pages/tenant/standards/bpa-report/view.js
+++ b/src/pages/tenant/standards/bpa-report/view.js
@@ -9,6 +9,7 @@ import {
   SvgIcon,
   Skeleton,
   Chip,
+  Alert,
 } from "@mui/material";
 import Head from "next/head";
 import { ArrowLeftIcon } from "@mui/x-date-pickers";
@@ -22,6 +23,7 @@ import { CippImageCard } from "../../../../components/CippCards/CippImageCard";
 import _ from "lodash";
 const Page = () => {
   const router = useRouter();
+  const { id } = router.query;
   const [blockCards, setBlockCards] = useState([]);
   const [layoutMode, setLayoutMode] = useState("Table");
   const bpaTemplateList = ApiGetCall({
@@ -33,8 +35,9 @@ const Page = () => {
     url: "/api/listBPA",
     data: {
       tenantFilter: tenantFilter,
+      report: id,
     },
-    queryKey: "ListBPA",
+    queryKey: `ListBPA-${id}-${tenantFilter}`,
   });
   const tenantInfo = ApiGetCall({
     url: "/api/ListTenants",
@@ -51,7 +54,6 @@ const Page = () => {
         setLayoutMode(bpaTemplate.Style);
         if (bpaTemplate.Style === "Tenant") {
           const frontendFields = bpaTemplate.Data.map((block) => block.FrontendFields[0]);
-
           if (bpaData.isSuccess) {
             const tenantId = tenantInfo?.data.find(
               (tenant) => tenant?.defaultDomainName === tenantFilter
@@ -62,7 +64,7 @@ const Page = () => {
               //instead of this, use lodash to get the data for blockData
               const blockData = _.get(tenantData, field.value)
                 ? _.get(tenantData, field.value)
-                : ["No Data"];
+                : undefined;
               return {
                 name: field.name,
                 value: field.value,
@@ -92,21 +94,12 @@ const Page = () => {
                 //sometimes the subField contains a space. Only take the first part of the subField if it does.
                 subField?.value?.includes(" ") ? subField.value.split(" ")[0] : subField.value
               );
+
               tenantData = Array.isArray(tenantData) ? tenantData : [tenantData];
               //filter down tenantData to only the fields listOfFrontEndFields
               tenantData = tenantData.map((data) => {
-                const filteredData = {};
                 listOfFrontEndFields.unshift("Tenant");
-                listOfFrontEndFields.forEach((field) => {
-                  //we need to get the correct key, but the key is nested and can contain dots, or []. So we use lodash get to get the correct key.
-                  const dataField = _.get(data, field) ? _.get(data, field) : "No Data";
-                  if (dataField === "FAILED") {
-                    filteredData[field] = "Failed";
-                  } else {
-                    filteredData[field] = dataField;
-                  }
-                });
-                return filteredData;
+                return data;
               });
               const cards = {
                 simpleColumns: listOfFrontEndFields,
@@ -189,7 +182,13 @@ const Page = () => {
                         </Typography>
                       }
                     >
-                      {block.formatter === "String" ? (
+                      {block.data === undefined ? (
+                        <Alert severity="info">
+                          No data has been found for this item. This tenant might not be licensed
+                          for this feature, or data collection failed. Please check the logs for
+                          more information.
+                        </Alert>
+                      ) : block.formatter === "String" ? (
                         <Typography variant="h6" color="textPrimary">
                           {block.data}
                         </Typography>
diff --git a/src/pages/tools/breachlookup/index.js b/src/pages/tools/breachlookup/index.js
index b7da246bd174..d50e98f137a7 100644
--- a/src/pages/tools/breachlookup/index.js
+++ b/src/pages/tools/breachlookup/index.js
@@ -8,6 +8,7 @@ import {
   Link,
   Chip,
   Avatar,
+  Alert,
 } from "@mui/material";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { useForm, useWatch } from "react-hook-form";
@@ -54,6 +55,12 @@ const Page = () => {
         <Grid container spacing={3}>
           <Grid container item spacing={4}>
             <Grid item spacing={4} xs={4}>
+              <Alert severity="info">
+                <Typography variant="body1" color="textPrimary">
+                  This page is in beta and may not always give expected results.
+                </Typography>
+              </Alert>
+
               <CippButtonCard title="Breach lookup">
                 <Grid container spacing={2}>
                   <Grid item xs={8}>
diff --git a/src/utils/get-cipp-formatting.js b/src/utils/get-cipp-formatting.js
index 916c9d461dc3..d8e7ff471c6d 100644
--- a/src/utils/get-cipp-formatting.js
+++ b/src/utils/get-cipp-formatting.js
@@ -203,8 +203,8 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
         ? data.join(", ")
         : data.map((item) => (
             <CippCopyToClipBoard
-              key={`${item.label}`}
-              text={item.label ? item.label : item}
+              key={`${item?.label}`}
+              text={item?.label ? item?.label : item}
               type="chip"
             />
           ));
@@ -212,7 +212,7 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
       return isText ? (
         data
       ) : (
-        <CippCopyToClipBoard text={data.label ? data.label : data} type="chip" />
+        <CippCopyToClipBoard text={data?.label ? data?.label : data} type="chip" />
       );
     }
   }