diff --git a/com.kdmanalytics.toif.ccr/src/com/kdmanalytics/toif/ccr/CoverageClaimGenerator.java b/com.kdmanalytics.toif.ccr/src/com/kdmanalytics/toif/ccr/CoverageClaimGenerator.java
index d3a8ffc1..969633d4 100644
--- a/com.kdmanalytics.toif.ccr/src/com/kdmanalytics/toif/ccr/CoverageClaimGenerator.java
+++ b/com.kdmanalytics.toif.ccr/src/com/kdmanalytics/toif/ccr/CoverageClaimGenerator.java
@@ -129,9 +129,10 @@ static Repository getRepositoryFromArguments(String[] args)
      * @param objFactory
      * @param segment
      * @param repository
+     * @param segment 
      * @return
      */
-    private static Collection<? extends Rule> getRules(ObjectFactory objFactory, Value cwe, Repository repository)
+    private static Collection<? extends Rule> getRules(ObjectFactory objFactory, Value cwe, Repository repository, Value segment)
     {
         HashMap<String, Rule> ruleSet = new HashMap<String, CWECoverageClaimType.Claims.Claim.RuleSet.Rule>();
         RepositoryConnection con = null;
@@ -139,7 +140,7 @@ private static Collection<? extends Rule> getRules(ObjectFactory objFactory, Val
         {
             con = getRepositoryConnection(repository);
             
-            String adaptorQuery = "SELECT ?descriptionText WHERE {" + "?finding <http://toif/toif:FindingHasCWEIdentifier> <" + cwe + "> . "
+            String adaptorQuery = "SELECT ?descriptionText WHERE {<"+segment+"> <http://toif/contains> ?finding. ?finding <http://toif/toif:FindingHasCWEIdentifier> <" + cwe + "> . "
                     + "?finding <http://toif/toif:FindingIsDescribedByWeaknessDescription> ?description . "
                     + "?description <http://toif/description> ?descriptionText . }";
             
@@ -348,7 +349,7 @@ private Collection<Claim> createClaims(ObjectFactory objFactory, Value segment,
                 
                 Claim claim = claims.get(cweIdString);
                 RuleSet ruleSet = objFactory.createCWECoverageClaimTypeClaimsClaimRuleSet();
-                ruleSet.getRule().addAll(getRules(objFactory, cwe, repository));
+                ruleSet.getRule().addAll(getRules(objFactory, cwe, repository,segment));
                 claim.setRuleSet(ruleSet);
                 
             }