diff --git a/src/app/pages/product-details/product-details.component.ts b/src/app/pages/product-details/product-details.component.ts
index 16e6fcd4..2eec1846 100644
--- a/src/app/pages/product-details/product-details.component.ts
+++ b/src/app/pages/product-details/product-details.component.ts
@@ -243,9 +243,9 @@ export class ProductDetailsComponent implements OnInit {
     }
 
     if(this.prodSpec.productSpecCharacteristic != undefined) {
-      // Avoid displaying the compliance credential
+      // Avoid displaying the compliance credential && Avoid showing "- enabled" chars
       this.prodChars = this.prodSpec.productSpecCharacteristic.filter((char: any) => {
-        return char.name != 'Compliance:VC' && char.name != 'Compliance:SelfAtt'
+        return char.name != 'Compliance:VC' && char.name != 'Compliance:SelfAtt' && !char.name?.endsWith(' - enabled')
       })
 
       for(let i=0; i<certifications.length; i++){
@@ -264,6 +264,7 @@ export class ProductDetailsComponent implements OnInit {
           this.prodChars.splice(index, 1);
         }
       }
+      
     }
 
     if(this.prodSpec.serviceSpecification != undefined){
diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts
index 71d5dd87..feb4c357 100644
--- a/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts
+++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/create-product-spec/create-product-spec.component.ts
@@ -426,7 +426,7 @@ export class CreateProductSpecComponent implements OnInit {
               }
               let fileBody = {
                 content: {
-                  name: prod_name+file.name,
+                  name: uuidv4()+'_'+file.name,
                   data: base64String
                 },
                 contentType: file.type,
diff --git a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts
index 5c163bf7..88b33850 100644
--- a/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts
+++ b/src/app/pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component.ts
@@ -631,7 +631,7 @@ export class UpdateProductSpecComponent implements OnInit {
               }
               let fileBody = {
                 content: {
-                  name: prod_name+file.name,
+                  name: uuidv4()+'_'+file.name,
                   data: base64String
                 },
                 contentType: file.type,
diff --git a/src/app/themes/dome.theme.ts b/src/app/themes/dome.theme.ts
index 42c8dfa5..def9c1b7 100644
--- a/src/app/themes/dome.theme.ts
+++ b/src/app/themes/dome.theme.ts
@@ -28,6 +28,11 @@ const domeHeaderLinks: NavLink[] = [
     label: 'HEADER._blog',
     url: '/blog',
     isRouterLink: true
+  },
+  {
+    label: 'FOOTER._contact',
+    url: '/contact-us',
+    isRouterLink: true
   }
 ];
 
@@ -36,7 +41,6 @@ const domeFooterLinks: NavLink[] = [
   { label: 'FOOTER._privacy', url: 'assets/documents/privacy.pdf', isRouterLink: false },
   { label: 'FOOTER._cookies', url: 'assets/documents/cookies.pdf', isRouterLink: false },
   { label: 'FOOTER._licensing', url: 'assets/documents/terms.pdf', isRouterLink: false },
-  { label: 'FOOTER._contact', url: '/contact-us', isRouterLink: true },
 ];