diff --git a/src/components/CippComponents/CippFormCondition.jsx b/src/components/CippComponents/CippFormCondition.jsx
index 9ec49a57ef5c..dd9a48cbf95d 100644
--- a/src/components/CippComponents/CippFormCondition.jsx
+++ b/src/components/CippComponents/CippFormCondition.jsx
@@ -18,7 +18,7 @@ export const CippFormCondition = (props) => {
 
   if (
     field === undefined ||
-    compareValue === undefined ||
+    (compareValue === undefined && compareType !== "hasValue") ||
     children === undefined ||
     formControl === undefined
   ) {
@@ -148,10 +148,18 @@ export const CippFormCondition = (props) => {
           watcher.length >= compareValue
         );
       case "hasValue":
-        return (
-          (watcher !== undefined && watcher !== null && watcher !== "") ||
-          (watcher?.value !== undefined && watcher?.value !== null && watcher?.value !== "")
-        );
+        // Check watchedValue (the extracted value based on propertyName)
+        // For simple values (strings, numbers)
+        if (watchedValue === undefined || watchedValue === null || watchedValue === "") {
+          return false;
+        }
+        // If it's an array, check if it has elements
+        if (Array.isArray(watchedValue)) {
+          return watchedValue.length > 0;
+        }
+        console.log("watched value:", watchedValue);
+        // For any other truthy value (objects, numbers, strings), consider it as having a value
+        return true;
       case "labelEq":
         return Array.isArray(watcher) && watcher.some((item) => item?.label === compareValue);
       case "labelContains":
diff --git a/src/components/CippStandards/CippStandardsSideBar.jsx b/src/components/CippStandards/CippStandardsSideBar.jsx
index 53a6d571b8a8..7e2ccdcb6647 100644
--- a/src/components/CippStandards/CippStandardsSideBar.jsx
+++ b/src/components/CippStandards/CippStandardsSideBar.jsx
@@ -144,34 +144,12 @@ const CippStandardsSideBar = ({
       }
 
       // Filter out current template if editing
-      console.log("Duplicate detection debug:", {
-        edit,
-        currentGUID: watchForm.GUID,
-        allTemplates: driftValidationApi.data?.map((t) => ({
-          GUID: t.GUID,
-          standardId: t.standardId,
-          standardName: t.standardName,
-        })),
-      });
-
       const existingTemplates = driftValidationApi.data.filter((template) => {
         const shouldInclude =
           edit && watchForm.GUID ? template.standardId !== watchForm.GUID : true;
-        console.log(
-          `Template ${template.standardId} (${template.standardName}): shouldInclude=${shouldInclude}, currentGUID=${watchForm.GUID}`
-        );
         return shouldInclude;
       });
 
-      console.log(
-        "Filtered templates:",
-        existingTemplates?.map((t) => ({
-          GUID: t.GUID,
-          standardId: t.standardId,
-          standardName: t.standardName,
-        }))
-      );
-
       // Get tenant groups data
       const groups = tenantGroupsApi.data?.Results || [];
 
@@ -198,45 +176,27 @@ const CippStandardsSideBar = ({
       });
 
       // Check for conflicts with unique templates
-      console.log("Checking conflicts with unique templates:", uniqueTemplates);
-      console.log("Selected tenant list:", selectedTenantList);
-
       for (const templateId in uniqueTemplates) {
         const template = uniqueTemplates[templateId];
         const templateTenants = template.tenants;
 
-        console.log(
-          `Checking template ${templateId} (${template.standardName}) with tenants:`,
-          templateTenants
-        );
-
         const hasConflict = selectedTenantList.some((selectedTenant) => {
           // Check if any template tenant matches the selected tenant
           const conflict = templateTenants.some((templateTenant) => {
             if (selectedTenant === "AllTenants" || templateTenant === "AllTenants") {
-              console.log(
-                `Conflict found: ${selectedTenant} vs ${templateTenant} (AllTenants match)`
-              );
               return true;
             }
             const match = selectedTenant === templateTenant;
-            if (match) {
-              console.log(`Conflict found: ${selectedTenant} vs ${templateTenant} (exact match)`);
-            }
             return match;
           });
           return conflict;
         });
 
-        console.log(`Template ${templateId} has conflict: ${hasConflict}`);
-
         if (hasConflict) {
           conflicts.push(template.standardName || "Unknown Template");
         }
       }
 
-      console.log("Final conflicts:", conflicts);
-
       if (conflicts.length > 0) {
         setDriftError(
           `This template has tenants that are assigned to another Drift Template. You can only assign one Drift Template to each tenant. Please check the ${conflicts.join(
diff --git a/src/data/standards.json b/src/data/standards.json
index 2d6ffb3f010a..92d605cf2036 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -5056,10 +5056,7 @@
           "queryKey": "ListIntuneTemplates-tag-autcomplete",
           "url": "/api/ListIntuneTemplates?mode=Tag",
           "labelField": "label",
-          "valueField": "value",
-          "addedField": {
-            "templates": "templates"
-          }
+          "valueField": "value"
         }
       },
       {