diff --git a/cautils/getter/armoapiutils.go b/cautils/getter/armoapiutils.go
index 98e76bd4..8f232a6c 100644
--- a/cautils/getter/armoapiutils.go
+++ b/cautils/getter/armoapiutils.go
@@ -50,7 +50,11 @@ func (armoAPI *ArmoAPI) GetCustomFrameworksForCustomer(customerGUID string) ([]s
 	err = json.Unmarshal([]byte(respStr), &frs)
 
 	for _, fr := range frs {
-		frameworkList = append(frameworkList, fr.Name)
+		if isNativeFramework(fr.Name) {
+			frameworkList = append(frameworkList, strings.ToLower(fr.Name))
+		} else {
+			frameworkList = append(frameworkList, fr.Name)
+		}
 	}
 
 	return frameworkList, nil
diff --git a/clihandler/initcli.go b/clihandler/initcli.go
index 5b66bfca..2b4c7b29 100644
--- a/clihandler/initcli.go
+++ b/clihandler/initcli.go
@@ -196,10 +196,22 @@ func Submit(submitInterfaces cliinterfaces.SubmitInterfaces) error {
 
 func SetScanForGivenFrameworks(scanInfo *cautils.ScanInfo, frameworks []string) *cautils.ScanInfo {
 	for _, framework := range frameworks {
-		newPolicy := reporthandling.PolicyIdentifier{}
-		newPolicy.Kind = reporthandling.KindFramework
-		newPolicy.Name = framework
-		scanInfo.PolicyIdentifier = append(scanInfo.PolicyIdentifier, newPolicy)
+
+		if !contains(scanInfo, framework) {
+			newPolicy := reporthandling.PolicyIdentifier{}
+			newPolicy.Kind = reporthandling.KindFramework
+			newPolicy.Name = framework
+			scanInfo.PolicyIdentifier = append(scanInfo.PolicyIdentifier, newPolicy)
+		}
 	}
 	return scanInfo
 }
+
+func contains(scanInfo *cautils.ScanInfo, framework string) bool {
+	for _, policy := range scanInfo.PolicyIdentifier {
+		if policy.Name == framework {
+			return true
+		}
+	}
+	return false
+}