diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index d66848b8ba4c00fa05b4f656860032b7f6bbd527..2ce970053874f5ae4b72bc357d26b80ea1e254b2 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -2977,7 +2977,7 @@ public class GTURTLEModeling {
         TraceManager.addDev("Searching for queries on " + mgui.getTabName(tp));
         ArrayList<TGComponent> list = new ArrayList<TGComponent>();
         ArrayList<TClass> tclasses;
-        tp.getAllCheckableTGComponent(list);
+        tp.getAllCheckedTGComponent(list);
         TGComponentAndUPPAALQuery tmpQ;
 
         ArrayList<TGComponentAndUPPAALQuery> listQ = new ArrayList<TGComponentAndUPPAALQuery>();
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index fef0831e3bf2df4f781c919ff8f137fa99d74c8a..68ec600e155f7040cc9abd7686a816532c3c5da2 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -2476,9 +2476,16 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
             }
         }
     }
+    
+    public void getAllCheckedTGComponent(ArrayList<TGComponent> _list) {
+        for (TGComponent tgc: this.componentList)
+            if (tgc.hasCheckedAccessibility())
+                _list.addAll(tgc.getAllCheckedAccessibility ());
+    }
+
     public void getAllCheckableTGComponent(ArrayList<TGComponent> _list) {
         for (TGComponent tgc: this.componentList)
-            if (tgc.hasCheckableAccessibility())
+            if (tgc instanceof CheckableAccessibility)
                 _list.addAll(tgc.getAllCheckableAccessibility ());
     }
 
diff --git a/src/main/java/ui/TGComponent.java b/src/main/java/ui/TGComponent.java
index 9a69286f04bf1701d8bfd660258f38fa08e68451..2b1ae0def82442b9148948f723748e88f015caf5 100755
--- a/src/main/java/ui/TGComponent.java
+++ b/src/main/java/ui/TGComponent.java
@@ -340,11 +340,27 @@ public abstract class TGComponent implements CDElement, GenericTree {
         return accessibility;
     }
 
-    public boolean hasCheckableAccessibility() {
+    public boolean hasCheckedAccessibility() {
         if (accessibility == true) {
             return true;
         }
 
+        if (nbInternalTGComponent >0) {
+            for(int i=0; i<tgcomponent.length; i++) {
+                if (tgcomponent[i].hasCheckedAccessibility()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public boolean hasCheckableAccessibility() {
+        if (this instanceof CheckableAccessibility) {
+            return true;
+        }
+
         if (nbInternalTGComponent >0) {
             for(int i=0; i<tgcomponent.length; i++) {
                 if (tgcomponent[i].hasCheckableAccessibility()) {
@@ -356,6 +372,25 @@ public abstract class TGComponent implements CDElement, GenericTree {
         return false;
     }
 
+    public java.util.List<TGComponent> getAllCheckedAccessibility() {
+        java.util.List<TGComponent> list = new LinkedList<TGComponent>();
+        getAllCheckedAccessibility(list);
+
+        return list;
+    }
+
+    public void getAllCheckedAccessibility(java.util.List<TGComponent> _list) {
+        if (accessibility) {
+            _list.add(this);
+        }
+
+        if (nbInternalTGComponent > 0) {
+            for(int i=0; i<tgcomponent.length; i++) {
+                tgcomponent[i].getAllCheckedAccessibility(_list);
+            }
+        }
+    }
+
     public java.util.List<TGComponent> getAllCheckableAccessibility() {
         java.util.List<TGComponent> list = new LinkedList<TGComponent>();
         getAllCheckableAccessibility(list);
@@ -364,7 +399,7 @@ public abstract class TGComponent implements CDElement, GenericTree {
     }
 
     public void getAllCheckableAccessibility(java.util.List<TGComponent> _list) {
-        if (accessibility) {
+	if (this instanceof CheckableAccessibility) {
             _list.add(this);
         }
 
@@ -373,8 +408,6 @@ public abstract class TGComponent implements CDElement, GenericTree {
                 tgcomponent[i].getAllCheckableAccessibility(_list);
             }
         }
-
-
     }
 
     public void setCheckableInvariant(boolean b) {
diff --git a/src/main/java/ui/TURTLEPanel.java b/src/main/java/ui/TURTLEPanel.java
index 5c389a1dc1f9b8a6ba2152c619437bd286760cb6..97129885c9a6d8c6f3c51e4e1c4b9c929644e45f 100755
--- a/src/main/java/ui/TURTLEPanel.java
+++ b/src/main/java/ui/TURTLEPanel.java
@@ -91,12 +91,19 @@ public abstract class TURTLEPanel implements GenericTree {
         return false;
     }
 
+    public void getAllCheckedTGComponent(ArrayList<TGComponent> _list) {
+        for(int i=0; i<panels.size(); i++) {
+            panelAt(i).getAllCheckedTGComponent(_list);
+        }
+    }
+    
     public void getAllCheckableTGComponent(ArrayList<TGComponent> _list) {
         for(int i=0; i<panels.size(); i++) {
             panelAt(i).getAllCheckableTGComponent(_list);
         }
     }
     
+    
     public void getAllLatencyChecks(ArrayList<TGComponent> _list){
         for(int i=0; i<panels.size(); i++) {
             panelAt(i).getAllLatencyChecks(_list);