diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 92b0506e..92f535bd 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -154,9 +154,6 @@
         <child id="1618328391714763070" name="macro" index="0oKgB" />
         <child id="6097203247162410403" name="prototype" index="3iTdIJ" />
       </concept>
-      <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
-        <child id="7871500063866331596" name="queryStage" index="92CTm" />
-      </concept>
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <reference id="6533016889631295418" name="queryType" index="KG3u5" />
         <child id="7871500063838282362" name="code" index="fHCRw" />
@@ -192,6 +189,9 @@
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
       <concept id="6533016889632449861" name="jetbrains.mps.lang.coderules.structure.QueryParameter" flags="ng" index="KwDlU" />
+      <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
+        <child id="6533016889629824446" name="query" index="KEEm1" />
+      </concept>
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
         <child id="6097203247147235901" name="logical" index="3h32gL" />
@@ -726,51 +726,6 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="6OXbTD$fzih">
-    <property role="TrG5h" value="TypecheckQuery" />
-    <node concept="2bWyPT" id="6OXbTD$fzli" role="92CTm">
-      <property role="TrG5h" value="main" />
-      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
-      <node concept="3clFbS" id="6OXbTD$fzlj" role="fHCRw">
-        <node concept="1nLNNL" id="6OXbTD$fzlv" role="3cqZAp">
-          <node concept="1nLNMm" id="6OXbTD$fzlw" role="1nLNNK">
-            <node concept="3NuqgR" id="6OXbTD$fzlK" role="0Rg$4">
-              <node concept="aZer4" id="6OXbTD$fzlL" role="3XD1gS">
-                <property role="TrG5h" value="A" />
-              </node>
-              <node concept="aZer4" id="6OXbTD$fzlM" role="3XD1gS">
-                <property role="TrG5h" value="B" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNuX" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdh5C" role="3xSepv">
-              <node concept="3Aq9E8" id="7mB3viLbExB" role="3xSepj">
-                <node concept="3I6sU6" id="7mB3viLbExC" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7mB3viLbExU" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7mB3viLbExT" role="3I6s78">
-                      <ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
-                      <node concept="37jhX" id="5HLeEcf2Ujj" role="3AunhB">
-                        <node concept="1nq8_$" id="5EDW3XEGpAq" role="37jj2">
-                          <node concept="37jhX" id="5EDW3XEGpAp" role="1nq8_t">
-                            <node concept="2OqwBi" id="5EDW3XEGpQT" role="37jj2">
-                              <node concept="KwDlU" id="5EDW3XEGpAo" role="2Oq$k0" />
-                              <node concept="liA8E" id="5EDW3XEGq3O" role="2OqNvi">
-                                <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="7mB3viLbCp8">
     <property role="TrG5h" value="Typeof" />
     <node concept="3AqmO8" id="7mB3viLbCp9" role="8PkJo">
@@ -1287,77 +1242,6 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="7mB3viLg9a7">
-    <property role="TrG5h" value="ConvertQuery" />
-    <node concept="2bWyPT" id="7mB3viLg9bK" role="92CTm">
-      <property role="TrG5h" value="main" />
-      <ref role="KG3u5" to="tj24:5EDW3XDYNS7" resolve="ConvertQuery" />
-      <node concept="3clFbS" id="7mB3viLg9bL" role="fHCRw">
-        <node concept="1nLNNL" id="7mB3viLg9c$" role="3cqZAp">
-          <node concept="1nLNMm" id="7mB3viLg9cA" role="1nLNNK">
-            <node concept="3NuqgR" id="7mB3viLg9gh" role="0Rg$4">
-              <node concept="aZer4" id="7mB3viLg9gi" role="3XD1gS">
-                <property role="TrG5h" value="From" />
-              </node>
-              <node concept="aZer4" id="7mB3viLg9gr" role="3XD1gS">
-                <property role="TrG5h" value="To" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNv0" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdh5F" role="3xSepv">
-              <node concept="3Aq9E8" id="7mB3viLg9eq" role="3xSepj">
-                <node concept="3I6sU6" id="7mB3viLg9er" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="1ALxU7rhvjz" role="3I6sU7">
-                    <node concept="3jbYBd" id="1ALxU7rhvjw" role="3I6s78">
-                      <ref role="3jbY9l" node="1ALxU7rg9$e" resolve="lift" />
-                      <node concept="2OqwBi" id="5EDW3XEGpi0" role="3jbY8P">
-                        <node concept="KwDlU" id="5EDW3XEGp9K" role="2Oq$k0" />
-                        <node concept="liA8E" id="5EDW3XEGpvz" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:5EDW3XDYObD" resolve="getFrom" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="1ALxU7rhwbx" role="3jbY8V">
-                        <ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="1ALxU7rhynO" role="3I6sU7">
-                    <node concept="3jbYBd" id="1ALxU7rhynL" role="3I6s78">
-                      <ref role="3jbY9l" node="1ALxU7rg9$e" resolve="lift" />
-                      <node concept="2OqwBi" id="5EDW3XEGpwc" role="3jbY8P">
-                        <node concept="KwDlU" id="5EDW3XEGpw0" role="2Oq$k0" />
-                        <node concept="liA8E" id="5EDW3XEGpwV" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:5EDW3XDYOe6" resolve="getTo" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="1ALxU7rkvea" role="3jbY8V">
-                        <ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="5EDW3XEGpxp" role="3xSepj">
-                <node concept="3I6sU6" id="5EDW3XEGpxq" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7mB3viLieFT" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7mB3viLieFR" role="3I6s78">
-                      <ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
-                      <node concept="a7P8L" id="7mB3viLieGe" role="3AunhB">
-                        <ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
-                      </node>
-                      <node concept="a7P8L" id="7mB3viLieG6" role="3AunhB">
-                        <ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="ns1xd" id="JOGAOsVt6x">
     <property role="TrG5h" value="Types" />
     <node concept="ns1x$" id="JOGAOsVt6y" role="ns1xc">
@@ -1384,5 +1268,118 @@
       </node>
     </node>
   </node>
+  <node concept="KEFAe" id="tbauFycd0b">
+    <property role="TrG5h" value="Queries" />
+    <node concept="2bWyPT" id="tbauFycdbI" role="KEEm1">
+      <property role="TrG5h" value="check" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
+      <node concept="3clFbS" id="tbauFycdbJ" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFycdbK" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFycdbL" role="1nLNNK">
+            <node concept="3NuqgR" id="tbauFycdbM" role="0Rg$4">
+              <node concept="aZer4" id="tbauFycdbN" role="3XD1gS">
+                <property role="TrG5h" value="A" />
+              </node>
+              <node concept="aZer4" id="tbauFycdbO" role="3XD1gS">
+                <property role="TrG5h" value="B" />
+              </node>
+              <node concept="32pEOW" id="tbauFycdbP" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="tbauFycdbQ" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFycdbR" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFycdbS" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFycdbT" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFycdbU" role="3I6s78">
+                      <ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
+                      <node concept="37jhX" id="tbauFycdbV" role="3AunhB">
+                        <node concept="1nq8_$" id="tbauFycdbW" role="37jj2">
+                          <node concept="37jhX" id="tbauFycdbX" role="1nq8_t">
+                            <node concept="2OqwBi" id="tbauFycdbY" role="37jj2">
+                              <node concept="KwDlU" id="tbauFycdbZ" role="2Oq$k0" />
+                              <node concept="liA8E" id="tbauFycdc0" role="2OqNvi">
+                                <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2bWyPT" id="tbauFycd1s" role="KEEm1">
+      <property role="TrG5h" value="convert" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNS7" resolve="ConvertQuery" />
+      <node concept="3clFbS" id="tbauFycd1t" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFycd1u" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFycd1v" role="1nLNNK">
+            <node concept="3NuqgR" id="tbauFycd1w" role="0Rg$4">
+              <node concept="aZer4" id="tbauFycd1x" role="3XD1gS">
+                <property role="TrG5h" value="From" />
+              </node>
+              <node concept="aZer4" id="tbauFycd1y" role="3XD1gS">
+                <property role="TrG5h" value="To" />
+              </node>
+              <node concept="32pEOW" id="tbauFycd1z" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="tbauFycd1$" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFycd1_" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFycd1A" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFycd1B" role="3I6sU7">
+                    <node concept="3jbYBd" id="tbauFycd1C" role="3I6s78">
+                      <ref role="3jbY9l" node="1ALxU7rg9$e" resolve="lift" />
+                      <node concept="2OqwBi" id="tbauFycd1D" role="3jbY8P">
+                        <node concept="KwDlU" id="tbauFycd1E" role="2Oq$k0" />
+                        <node concept="liA8E" id="tbauFycd1F" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:5EDW3XDYObD" resolve="getFrom" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="tbauFycd1G" role="3jbY8V">
+                        <ref role="a7OzE" node="tbauFycd1x" resolve="From" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFycd1H" role="3I6sU7">
+                    <node concept="3jbYBd" id="tbauFycd1I" role="3I6s78">
+                      <ref role="3jbY9l" node="1ALxU7rg9$e" resolve="lift" />
+                      <node concept="2OqwBi" id="tbauFycd1J" role="3jbY8P">
+                        <node concept="KwDlU" id="tbauFycd1K" role="2Oq$k0" />
+                        <node concept="liA8E" id="tbauFycd1L" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:5EDW3XDYOe6" resolve="getTo" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="tbauFycd1M" role="3jbY8V">
+                        <ref role="a7OzE" node="tbauFycd1y" resolve="To" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="tbauFycd1N" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFycd1O" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFycd1P" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFycd1Q" role="3I6s78">
+                      <ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
+                      <node concept="a7P8L" id="tbauFycd1R" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFycd1x" resolve="From" />
+                      </node>
+                      <node concept="a7P8L" id="tbauFycd1S" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFycd1y" resolve="To" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index 7a62433f..405c68ed 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -80,9 +80,6 @@
       </concept>
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
-      <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
-        <child id="7871500063866331596" name="queryStage" index="92CTm" />
-      </concept>
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <reference id="6533016889631295418" name="queryType" index="KG3u5" />
         <child id="7871500063838282362" name="code" index="fHCRw" />
@@ -103,6 +100,9 @@
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
       <concept id="6533016889632449861" name="jetbrains.mps.lang.coderules.structure.QueryParameter" flags="ng" index="KwDlU" />
+      <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
+        <child id="6533016889629824446" name="query" index="KEEm1" />
+      </concept>
       <concept id="4957570047283823112" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackConstraint" flags="ng" index="1lHd6T">
         <property id="4957570047283824112" name="severity" index="1lHdp1" />
         <child id="4957570047284421439" name="message" index="1ljv2e" />
@@ -529,26 +529,33 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="2rdxkKxrUlk">
-    <property role="TrG5h" value="Typecheck" />
-    <node concept="2bWyPT" id="2rdxkKxrXzd" role="92CTm">
-      <property role="TrG5h" value="checkAll" />
+  <node concept="ns1xd" id="7VBaGntKJ6x">
+    <property role="TrG5h" value="Types" />
+    <node concept="ns1x$" id="7VBaGntKJ6y" role="ns1xc">
+      <property role="TrG5h" value="Ok" />
+      <node concept="nspSf" id="7VBaGntKJ6z" role="ns1xx" />
+    </node>
+  </node>
+  <node concept="KEFAe" id="tbauFycdZ3">
+    <property role="TrG5h" value="Queries" />
+    <node concept="2bWyPT" id="tbauFycdZe" role="KEEm1">
+      <property role="TrG5h" value="check" />
       <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
-      <node concept="3clFbS" id="2rdxkKxrXze" role="fHCRw">
-        <node concept="1nLNNL" id="2rdxkKxrX$v" role="3cqZAp">
-          <node concept="1nLNMm" id="2rdxkKxrX$x" role="1nLNNK">
-            <node concept="3xSepi" id="6E2cNicdhiD" role="3xSepv">
-              <node concept="3Aq9E8" id="2rdxkKxrXAg" role="3xSepj">
-                <node concept="3I6sU6" id="2rdxkKxrXAh" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2rdxkKxrXAl" role="3I6sU7">
-                    <node concept="3Aqt3T" id="2rdxkKxrXAk" role="3I6s78">
+      <node concept="3clFbS" id="tbauFycdZf" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFycdZg" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFycdZh" role="1nLNNK">
+            <node concept="3xSepi" id="tbauFycdZi" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFycdZj" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFycdZk" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFycdZl" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFycdZm" role="3I6s78">
                       <ref role="3AqCNq" node="2aBGSFge6lJ" resolve="checkAll" />
-                      <node concept="37jhX" id="5HLeEcf2UnH" role="3AunhB">
-                        <node concept="1nq8_$" id="5EDW3XEGqcw" role="37jj2">
-                          <node concept="37jhX" id="5EDW3XEGqcv" role="1nq8_t">
-                            <node concept="2OqwBi" id="5EDW3XEGqlP" role="37jj2">
-                              <node concept="KwDlU" id="5EDW3XEGqcu" role="2Oq$k0" />
-                              <node concept="liA8E" id="5EDW3XEGqwI" role="2OqNvi">
+                      <node concept="37jhX" id="tbauFycdZn" role="3AunhB">
+                        <node concept="1nq8_$" id="tbauFycdZo" role="37jj2">
+                          <node concept="37jhX" id="tbauFycdZp" role="1nq8_t">
+                            <node concept="2OqwBi" id="tbauFycdZq" role="37jj2">
+                              <node concept="KwDlU" id="tbauFycdZr" role="2Oq$k0" />
+                              <node concept="liA8E" id="tbauFycdZs" role="2OqNvi">
                                 <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
                               </node>
                             </node>
@@ -565,12 +572,5 @@
       </node>
     </node>
   </node>
-  <node concept="ns1xd" id="7VBaGntKJ6x">
-    <property role="TrG5h" value="Types" />
-    <node concept="ns1x$" id="7VBaGntKJ6y" role="ns1xc">
-      <property role="TrG5h" value="Ok" />
-      <node concept="nspSf" id="7VBaGntKJ6z" role="ns1xx" />
-    </node>
-  </node>
 </model>
 
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 459eed7f..ff6f2aaa 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -366,9 +366,6 @@
         <child id="1618328391714763070" name="macro" index="0oKgB" />
         <child id="6097203247162410403" name="prototype" index="3iTdIJ" />
       </concept>
-      <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
-        <child id="7871500063866331596" name="queryStage" index="92CTm" />
-      </concept>
       <concept id="1980609059169917031" name="jetbrains.mps.lang.coderules.structure.CopyItem" flags="ng" index="9KH4l">
         <child id="1980609059169917850" name="origin" index="9KHbC" />
       </concept>
@@ -416,6 +413,9 @@
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
       <concept id="6533016889632449861" name="jetbrains.mps.lang.coderules.structure.QueryParameter" flags="ng" index="KwDlU" />
+      <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
+        <child id="6533016889629824446" name="query" index="KEEm1" />
+      </concept>
       <concept id="1204249894870288679" name="jetbrains.mps.lang.coderules.structure.RequireAllStatement" flags="ng" index="Oftf1">
         <child id="1204249894870289978" name="nodes" index="Oftjs" />
       </concept>
@@ -7381,42 +7381,6 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="5Eb7bDWO4vA">
-    <property role="TrG5h" value="Typecheck" />
-    <node concept="2bWyPT" id="5Eb7bDWO9gE" role="92CTm">
-      <property role="TrG5h" value="recover" />
-      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
-      <node concept="3clFbS" id="5Eb7bDWO9gF" role="fHCRw">
-        <node concept="1nLNNL" id="5Eb7bDWO9jS" role="3cqZAp">
-          <node concept="1nLNMm" id="5Eb7bDWO9jT" role="1nLNNK">
-            <node concept="3xSepi" id="6E2cNicdhkZ" role="3xSepv">
-              <node concept="3Aq9E8" id="5Eb7bDWO9lC" role="3xSepj">
-                <node concept="3I6sU6" id="5Eb7bDWO9lD" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="5Eb7bDWO9lH" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5Eb7bDWO9lG" role="3I6s78">
-                      <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
-                      <node concept="37jhX" id="5HLeEcf2UoA" role="3AunhB">
-                        <node concept="1nq8_$" id="5EDW3XEGq$3" role="37jj2">
-                          <node concept="37jhX" id="5EDW3XEGq$2" role="1nq8_t">
-                            <node concept="2OqwBi" id="5EDW3XEGqOy" role="37jj2">
-                              <node concept="KwDlU" id="5EDW3XEGq$1" role="2Oq$k0" />
-                              <node concept="liA8E" id="5EDW3XEGr1t" role="2OqNvi">
-                                <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="48ZGLP8pG4t">
     <property role="TrG5h" value="subsumption" />
     <node concept="3AqmO8" id="48ZGLP8pG4u" role="8PkJo">
@@ -16347,5 +16311,41 @@
       <node concept="nspSf" id="48ZGLP7pl6O" role="ns1xx" />
     </node>
   </node>
+  <node concept="KEFAe" id="tbauFyce2D">
+    <property role="TrG5h" value="Queries" />
+    <node concept="2bWyPT" id="tbauFyce2O" role="KEEm1">
+      <property role="TrG5h" value="check" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
+      <node concept="3clFbS" id="tbauFyce2P" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFyce2Q" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFyce2R" role="1nLNNK">
+            <node concept="3xSepi" id="tbauFyce2S" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFyce2T" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFyce2U" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFyce2V" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFyce2W" role="3I6s78">
+                      <ref role="3AqCNq" node="4dPZ2m2jAgt" resolve="recoverAll" />
+                      <node concept="37jhX" id="tbauFyce2X" role="3AunhB">
+                        <node concept="1nq8_$" id="tbauFyce2Y" role="37jj2">
+                          <node concept="37jhX" id="tbauFyce2Z" role="1nq8_t">
+                            <node concept="2OqwBi" id="tbauFyce30" role="37jj2">
+                              <node concept="KwDlU" id="tbauFyce31" role="2Oq$k0" />
+                              <node concept="liA8E" id="tbauFyce32" role="2OqNvi">
+                                <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index ab8c1709..e7cd0c29 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -236,9 +236,6 @@
       <concept id="1522217801069359738" name="jetbrains.mps.baseLanguage.collections.structure.ReduceLeftOperation" flags="nn" index="1MCZdW" />
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
-      <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
-        <child id="7871500063866331596" name="queryStage" index="92CTm" />
-      </concept>
       <concept id="6928531011217292466" name="jetbrains.mps.lang.coderules.structure.IsfreeVariableConstraint" flags="ng" index="2aLmEc" />
       <concept id="6928531011217258898" name="jetbrains.mps.lang.coderules.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
         <child id="6928531011217290187" name="variable" index="2aLmnP" />
@@ -261,6 +258,9 @@
       <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.LateExpressionItem" flags="ng" index="HKQnh">
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
+      <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
+        <child id="6533016889629824446" name="query" index="KEEm1" />
+      </concept>
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="4957570047283823112" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackConstraint" flags="ng" index="1lHd6T">
         <property id="4957570047283824112" name="severity" index="1lHdp1" />
@@ -327,40 +327,6 @@
       <concept id="965748826975413063" name="jetbrains.mps.lang.coderules.structure.RulePartParameterDeclaration" flags="ng" index="3NuqgR" />
     </language>
   </registry>
-  <node concept="92CTh" id="78H58oerFvo">
-    <property role="TrG5h" value="CheckControlflow" />
-    <node concept="2bWyPT" id="78H58oerI06" role="92CTm">
-      <property role="TrG5h" value="check" />
-      <ref role="KG3u5" to="fjx4:5EDW3XDZxpN" resolve="CheckQuery" />
-      <node concept="3clFbS" id="78H58oerI07" role="fHCRw">
-        <node concept="1nLNNL" id="78H58oerI2s" role="3cqZAp">
-          <node concept="1nLNMm" id="78H58oerI2t" role="1nLNNK">
-            <node concept="3xSepi" id="6E2cNicdigB" role="3xSepv">
-              <node concept="3Aq9E8" id="78H58oeAoeW" role="3xSepj">
-                <node concept="3I6sU6" id="78H58oeAoeX" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="AoTMCCZ1wu" role="3I6sU7">
-                    <node concept="3Aqt3T" id="AoTMCCZ1ws" role="3I6s78">
-                      <ref role="3AqCNq" node="AoTMCCZ1rq" resolve="trace" />
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="AoTMCCYGHy" role="3I6sU7">
-                    <node concept="3Aqt3T" id="AoTMCCYGHw" role="3I6s78">
-                      <ref role="3AqCNq" node="AoTMCCYnN1" resolve="rw" />
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="5pIcDR7JOyn" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5pIcDR7JOyl" role="3I6s78">
-                      <ref role="3AqCNq" node="78H58oeAof4" resolve="checkAll" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="78H58oerI5G">
     <property role="TrG5h" value="Reachability" />
     <node concept="1nLNMY" id="6Yb9hAqKtVm" role="1nK1Vg">
@@ -6877,5 +6843,39 @@
     </node>
     <node concept="3Tm1VV" id="7pxta7vc_Jc" role="1B3o_S" />
   </node>
+  <node concept="KEFAe" id="tbauFy8Ze_">
+    <property role="TrG5h" value="Queries" />
+    <node concept="2bWyPT" id="tbauFy8ZeH" role="KEEm1">
+      <property role="TrG5h" value="check" />
+      <ref role="KG3u5" to="fjx4:5EDW3XDZxpN" resolve="CheckQuery" />
+      <node concept="3clFbS" id="tbauFy8ZeI" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFy8ZeJ" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFy8ZeK" role="1nLNNK">
+            <node concept="3xSepi" id="tbauFy8ZeL" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFy8ZeM" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFy8ZeN" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFy8ZeO" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFy8ZeP" role="3I6s78">
+                      <ref role="3AqCNq" node="AoTMCCZ1rq" resolve="trace" />
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFy8ZeQ" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFy8ZeR" role="3I6s78">
+                      <ref role="3AqCNq" node="AoTMCCYnN1" resolve="rw" />
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFy8ZeS" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFy8ZeT" role="3I6s78">
+                      <ref role="3AqCNq" node="78H58oeAof4" resolve="checkAll" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 0bf6991d..36c5b000 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -645,9 +645,6 @@
         <child id="1618328391714763070" name="macro" index="0oKgB" />
         <child id="6097203247162410403" name="prototype" index="3iTdIJ" />
       </concept>
-      <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
-        <child id="7871500063866331596" name="queryStage" index="92CTm" />
-      </concept>
       <concept id="1980609059169917031" name="jetbrains.mps.lang.coderules.structure.CopyItem" flags="ng" index="9KH4l">
         <child id="1980609059169917850" name="origin" index="9KHbC" />
       </concept>
@@ -698,6 +695,9 @@
         <child id="6856711987714624233" name="code" index="HKQng" />
       </concept>
       <concept id="6533016889632449861" name="jetbrains.mps.lang.coderules.structure.QueryParameter" flags="ng" index="KwDlU" />
+      <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
+        <child id="6533016889629824446" name="query" index="KEEm1" />
+      </concept>
       <concept id="5042557354438383712" name="jetbrains.mps.lang.coderules.structure.TermListType" flags="ig" index="VbTHi" />
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247139556923" name="jetbrains.mps.lang.coderules.structure.CallMacroTemplate" flags="ng" index="3hwh0R">
@@ -32435,135 +32435,6 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="6OXbTD$fto2">
-    <property role="TrG5h" value="Typecheck" />
-    <property role="3GE5qa" value="query" />
-    <node concept="2bWyPT" id="6OXbTD$ftqj" role="92CTm">
-      <property role="TrG5h" value="check" />
-      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
-      <node concept="3clFbS" id="6OXbTD$ftqk" role="fHCRw">
-        <node concept="1nLNNL" id="6OXbTD$ftql" role="3cqZAp">
-          <node concept="1nLNMm" id="6OXbTD$ftqm" role="1nLNNK">
-            <node concept="3xSepi" id="6E2cNicdikP" role="3xSepv">
-              <node concept="3Aq9E8" id="6OXbTD$ftqn" role="3xSepj">
-                <node concept="3I6sU6" id="6OXbTD$ftqo" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="36PPzUCxZIb" role="3I6sU7">
-                    <node concept="3Aqt3T" id="36PPzUCxZI9" role="3I6s78">
-                      <ref role="3AqCNq" node="36PPzUCxZA0" resolve="importDecls" />
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="5Oz70LKdkQP" role="3I6sU7">
-                    <node concept="3Aqt3T" id="5Oz70LKdkQN" role="3I6s78">
-                      <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="6OXbTD_c30h" role="3I6sU7">
-                    <node concept="3Aqt3T" id="6OXbTD_c30g" role="3I6s78">
-                      <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="5EDW3XEGoAR" role="3xSepj">
-                <node concept="3I6sU6" id="5EDW3XEGoAS" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="12QmIoyIWn9" role="3I6sU7">
-                    <node concept="3Aqt3T" id="12QmIoyIWn7" role="3I6s78">
-                      <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
-                      <node concept="37jhX" id="5HLeEcf2UrN" role="3AunhB">
-                        <node concept="1nq8_$" id="5EDW3XEGoBn" role="37jj2">
-                          <node concept="37jhX" id="5EDW3XEGoBm" role="1nq8_t">
-                            <node concept="2OqwBi" id="5EDW3XEGoRQ" role="37jj2">
-                              <node concept="KwDlU" id="5EDW3XEGoBl" role="2Oq$k0" />
-                              <node concept="liA8E" id="5EDW3XEGp0x" role="2OqNvi">
-                                <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6OXbTD$ftqD" role="3cqZAp" />
-      </node>
-    </node>
-  </node>
-  <node concept="92CTh" id="6OXbTD$ftrf">
-    <property role="TrG5h" value="ConvertsTo" />
-    <property role="3GE5qa" value="query" />
-    <node concept="2bWyPT" id="6OXbTD$fttw" role="92CTm">
-      <property role="TrG5h" value="subtypeOf" />
-      <ref role="KG3u5" to="tj24:5EDW3XDYNS7" resolve="ConvertQuery" />
-      <node concept="3clFbS" id="6OXbTD$fttx" role="fHCRw">
-        <node concept="1nLNNL" id="6OXbTD$fttF" role="3cqZAp">
-          <node concept="1nLNMm" id="6OXbTD$fttG" role="1nLNNK">
-            <node concept="3NuqgR" id="6OXbTD$fttW" role="0Rg$4">
-              <node concept="aZer4" id="6OXbTD$fttX" role="3XD1gS">
-                <property role="TrG5h" value="A" />
-              </node>
-              <node concept="aZer4" id="6OXbTD$fttY" role="3XD1gS">
-                <property role="TrG5h" value="B" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNFK" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdikQ" role="3xSepv">
-              <node concept="3Aq9E8" id="6OXbTD$fttH" role="3xSepj">
-                <node concept="3I6sU6" id="6OXbTD$fttI" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="6OXbTD$fttJ" role="3I6sU7">
-                    <node concept="3jbYBd" id="5itBwMb5r7w" role="3I6s78">
-                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                      <node concept="a7P8L" id="6OXbTD$fttL" role="3jbY8V">
-                        <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
-                      </node>
-                      <node concept="2OqwBi" id="5EDW3XEGo97" role="3jbY8P">
-                        <node concept="KwDlU" id="5EDW3XEGo0R" role="2Oq$k0" />
-                        <node concept="liA8E" id="5EDW3XEGoh4" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:5EDW3XDYObD" resolve="getFrom" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="6OXbTD$fttN" role="3I6sU7">
-                    <node concept="3jbYBd" id="5itBwMb5r7x" role="3I6s78">
-                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                      <node concept="2OqwBi" id="5EDW3XEGosJ" role="3jbY8P">
-                        <node concept="KwDlU" id="5EDW3XEGokv" role="2Oq$k0" />
-                        <node concept="liA8E" id="5EDW3XEGo_8" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:5EDW3XDYOe6" resolve="getTo" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="6OXbTD$fttP" role="3jbY8V">
-                        <ref role="a7OzE" node="6OXbTD$fttY" resolve="B" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="5EDW3XEGoiV" role="3xSepj">
-                <node concept="3I6sU6" id="5EDW3XEGoiW" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="6OXbTD$fttR" role="3I6sU7">
-                    <node concept="3Aqt3T" id="6OXbTD$fttS" role="3I6s78">
-                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                      <node concept="a7P8L" id="6OXbTD$fttT" role="3AunhB">
-                        <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
-                      </node>
-                      <node concept="a7P8L" id="6OXbTD$fttU" role="3AunhB">
-                        <ref role="a7OzE" node="6OXbTD$fttY" resolve="B" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="35YJGAK4DLL">
     <property role="3GE5qa" value="rule.relation" />
     <property role="TrG5h" value="OperationPromote" />
@@ -38280,118 +38151,6 @@
       </node>
     </node>
   </node>
-  <node concept="92CTh" id="7Bx7XgEggjY">
-    <property role="TrG5h" value="CoerceTo" />
-    <property role="3GE5qa" value="query" />
-    <node concept="2bWyPT" id="7Bx7XgEgglV" role="92CTm">
-      <property role="TrG5h" value="coerceTo" />
-      <ref role="KG3u5" to="tj24:5EDW3XDYNTS" resolve="CoerceQuery" />
-      <node concept="3clFbS" id="7Bx7XgEgglW" role="fHCRw">
-        <node concept="1nLNNL" id="7Bx7XgEggn0" role="3cqZAp">
-          <node concept="1nLNMm" id="7Bx7XgEggn1" role="1nLNNK">
-            <node concept="3NuqgR" id="7Bx7XgEggn7" role="0Rg$4">
-              <node concept="aZer4" id="7Bx7XgEggn8" role="3XD1gS">
-                <property role="TrG5h" value="A" />
-              </node>
-              <node concept="aZer4" id="7Bx7XgEggne" role="3XD1gS">
-                <property role="TrG5h" value="B" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNG8" role="3vLBG7" />
-            </node>
-            <node concept="3NuqgR" id="4pwDyRB4QgW" role="0Rg$4">
-              <node concept="aZer4" id="4pwDyRB4Q8E" role="3XD1gS">
-                <property role="TrG5h" value="Node" />
-              </node>
-              <node concept="3Tqbb2" id="4pwDyRB4Qh7" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdile" role="3xSepv">
-              <node concept="3Aq9E8" id="7Bx7XgEggnq" role="3xSepj">
-                <node concept="3I6sU6" id="7Bx7XgEggnr" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7Bx7XgEggnx" role="3I6sU7">
-                    <node concept="3jbYBd" id="5itBwMb5r7y" role="3I6s78">
-                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                      <node concept="2OqwBi" id="5EDW3XEEM0G" role="3jbY8P">
-                        <node concept="KwDlU" id="5EDW3XEELSs" role="2Oq$k0" />
-                        <node concept="liA8E" id="5EDW3XEEM95" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:5EDW3XDYNZD" resolve="getSource" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="7Bx7XgEggnB" role="3jbY8V">
-                        <ref role="a7OzE" node="7Bx7XgEggn8" resolve="A" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="7Bx7XgEggnV" role="3I6sU7">
-                    <node concept="3jbYBd" id="5itBwMb5r7z" role="3I6s78">
-                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                      <node concept="2OqwBi" id="5EDW3XEEMhP" role="3jbY8P">
-                        <node concept="KwDlU" id="5EDW3XEEM9_" role="2Oq$k0" />
-                        <node concept="liA8E" id="5EDW3XEEMqe" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:5EDW3XEtgZU" resolve="getTargetConcept" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="7Bx7XgEggo5" role="3jbY8V">
-                        <ref role="a7OzE" node="7Bx7XgEggne" resolve="B" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="5EDW3XEEMyN" role="3xSepj">
-                <node concept="3I6sU6" id="5EDW3XEEMyO" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="7Bx7XgEggop" role="3I6sU7">
-                    <node concept="3Aqt3T" id="7Bx7XgEggon" role="3I6s78">
-                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                      <node concept="a7P8L" id="7Bx7XgEggo$" role="3AunhB">
-                        <ref role="a7OzE" node="7Bx7XgEggn8" resolve="A" />
-                      </node>
-                      <node concept="a7P8L" id="7Bx7XgEggoF" role="3AunhB">
-                        <ref role="a7OzE" node="7Bx7XgEggne" resolve="B" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="4pwDyRB4Q94" role="3I6sU7">
-                    <node concept="3Aqt3T" id="4pwDyRB4Q92" role="3I6s78">
-                      <ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
-                      <node concept="a7P8L" id="4pwDyRB4Q9n" role="3AunhB">
-                        <ref role="a7OzE" node="4pwDyRB4Q8E" resolve="Node" />
-                      </node>
-                      <node concept="a7P8L" id="4pwDyRB4QgC" role="3AunhB">
-                        <ref role="a7OzE" node="7Bx7XgEggne" resolve="B" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="5EDW3XEEMsw" role="3xSepj">
-                <node concept="3I6sU6" id="5EDW3XEEMsx" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="4pwDyRBIFn$" role="3I6sU7">
-                    <node concept="3A8Hvi" id="4pwDyRBIFnu" role="3I6s78">
-                      <node concept="37jhX" id="5HLeEcf2Usd" role="3A8wtg">
-                        <node concept="1nq8_$" id="5EDW3XEEMEb" role="37jj2">
-                          <node concept="37jhX" id="5EDW3XEEMEa" role="1nq8_t">
-                            <node concept="2OqwBi" id="5EDW3XEEMMS" role="37jj2">
-                              <node concept="KwDlU" id="5EDW3XEEME9" role="2Oq$k0" />
-                              <node concept="liA8E" id="5EDW3XEEMVl" role="2OqNvi">
-                                <ref role="37wK5l" to="tj24:5EDW3XDYO56" resolve="getResult" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="4pwDyRBIFo2" role="3A8w4Q">
-                        <ref role="a7OzE" node="4pwDyRB4Q8E" resolve="Node" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="pupwRqIThK">
     <property role="3GE5qa" value="rule.expression" />
     <property role="TrG5h" value="Array" />
@@ -48608,5 +48367,238 @@
       <node concept="nspSf" id="JOGAOsVt3d" role="ns1xx" />
     </node>
   </node>
+  <node concept="KEFAe" id="tbauFybkh8">
+    <property role="3GE5qa" value="query" />
+    <property role="TrG5h" value="Queries" />
+    <node concept="2bWyPT" id="tbauFyccEM" role="KEEm1">
+      <property role="TrG5h" value="check" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
+      <node concept="3clFbS" id="tbauFyccEN" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFyccEO" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFyccEP" role="1nLNNK">
+            <node concept="3xSepi" id="tbauFyccEQ" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFyccER" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFyccES" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFyccET" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFyccEU" role="3I6s78">
+                      <ref role="3AqCNq" node="36PPzUCxZA0" resolve="importDecls" />
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFyccEV" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFyccEW" role="3I6s78">
+                      <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFyccEX" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFyccEY" role="3I6s78">
+                      <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="tbauFyccEZ" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFyccF0" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFyccF1" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFyccF2" role="3I6s78">
+                      <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
+                      <node concept="37jhX" id="tbauFyccF3" role="3AunhB">
+                        <node concept="1nq8_$" id="tbauFyccF4" role="37jj2">
+                          <node concept="37jhX" id="tbauFyccF5" role="1nq8_t">
+                            <node concept="2OqwBi" id="tbauFyccF6" role="37jj2">
+                              <node concept="KwDlU" id="tbauFyccF7" role="2Oq$k0" />
+                              <node concept="liA8E" id="tbauFyccF8" role="2OqNvi">
+                                <ref role="37wK5l" to="tj24:5EDW3XDYOgY" resolve="getTypesCollector" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="tbauFyccF9" role="3cqZAp" />
+      </node>
+    </node>
+    <node concept="2bWyPT" id="tbauFybkrp" role="KEEm1">
+      <property role="TrG5h" value="convert" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNS7" resolve="ConvertQuery" />
+      <node concept="3clFbS" id="tbauFybkrq" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFybkrr" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFybkrs" role="1nLNNK">
+            <node concept="3NuqgR" id="tbauFybkrt" role="0Rg$4">
+              <node concept="aZer4" id="tbauFybkru" role="3XD1gS">
+                <property role="TrG5h" value="A" />
+              </node>
+              <node concept="aZer4" id="tbauFybkrv" role="3XD1gS">
+                <property role="TrG5h" value="B" />
+              </node>
+              <node concept="32pEOW" id="tbauFybkrw" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="tbauFybkrx" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFybkry" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFybkrz" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFybkr$" role="3I6sU7">
+                    <node concept="3jbYBd" id="tbauFybkr_" role="3I6s78">
+                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                      <node concept="a7P8L" id="tbauFybkrA" role="3jbY8V">
+                        <ref role="a7OzE" node="tbauFybkru" resolve="A" />
+                      </node>
+                      <node concept="2OqwBi" id="tbauFybkrB" role="3jbY8P">
+                        <node concept="KwDlU" id="tbauFybkrC" role="2Oq$k0" />
+                        <node concept="liA8E" id="tbauFybkrD" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:5EDW3XDYObD" resolve="getFrom" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFybkrE" role="3I6sU7">
+                    <node concept="3jbYBd" id="tbauFybkrF" role="3I6s78">
+                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                      <node concept="2OqwBi" id="tbauFybkrG" role="3jbY8P">
+                        <node concept="KwDlU" id="tbauFybkrH" role="2Oq$k0" />
+                        <node concept="liA8E" id="tbauFybkrI" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:5EDW3XDYOe6" resolve="getTo" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkrJ" role="3jbY8V">
+                        <ref role="a7OzE" node="tbauFybkrv" resolve="B" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="tbauFybkrK" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFybkrL" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFybkrM" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFybkrN" role="3I6s78">
+                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                      <node concept="a7P8L" id="tbauFybkrO" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFybkru" resolve="A" />
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkrP" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFybkrv" resolve="B" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2bWyPT" id="tbauFybkiz" role="KEEm1">
+      <property role="TrG5h" value="coerce" />
+      <ref role="KG3u5" to="tj24:5EDW3XDYNTS" resolve="CoerceQuery" />
+      <node concept="3clFbS" id="tbauFybki$" role="fHCRw">
+        <node concept="1nLNNL" id="tbauFybki_" role="3cqZAp">
+          <node concept="1nLNMm" id="tbauFybkiA" role="1nLNNK">
+            <node concept="3NuqgR" id="tbauFybkiB" role="0Rg$4">
+              <node concept="aZer4" id="tbauFybkiC" role="3XD1gS">
+                <property role="TrG5h" value="A" />
+              </node>
+              <node concept="aZer4" id="tbauFybkiD" role="3XD1gS">
+                <property role="TrG5h" value="B" />
+              </node>
+              <node concept="32pEOW" id="tbauFybkiE" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="tbauFybkiF" role="0Rg$4">
+              <node concept="aZer4" id="tbauFybkiG" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="tbauFybkiH" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="tbauFybkiI" role="3xSepv">
+              <node concept="3Aq9E8" id="tbauFybkiJ" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFybkiK" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFybkiL" role="3I6sU7">
+                    <node concept="3jbYBd" id="tbauFybkiM" role="3I6s78">
+                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                      <node concept="2OqwBi" id="tbauFybkiN" role="3jbY8P">
+                        <node concept="KwDlU" id="tbauFybkiO" role="2Oq$k0" />
+                        <node concept="liA8E" id="tbauFybkiP" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:5EDW3XDYNZD" resolve="getSource" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkiQ" role="3jbY8V">
+                        <ref role="a7OzE" node="tbauFybkiC" resolve="A" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFybkiR" role="3I6sU7">
+                    <node concept="3jbYBd" id="tbauFybkiS" role="3I6s78">
+                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                      <node concept="2OqwBi" id="tbauFybkiT" role="3jbY8P">
+                        <node concept="KwDlU" id="tbauFybkiU" role="2Oq$k0" />
+                        <node concept="liA8E" id="tbauFybkiV" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:5EDW3XEtgZU" resolve="getTargetConcept" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkiW" role="3jbY8V">
+                        <ref role="a7OzE" node="tbauFybkiD" resolve="B" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="tbauFybkiX" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFybkiY" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFybkiZ" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFybkj0" role="3I6s78">
+                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                      <node concept="a7P8L" id="tbauFybkj1" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFybkiC" resolve="A" />
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkj2" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFybkiD" resolve="B" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="tbauFybkj3" role="3I6sU7">
+                    <node concept="3Aqt3T" id="tbauFybkj4" role="3I6s78">
+                      <ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
+                      <node concept="a7P8L" id="tbauFybkj5" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFybkiG" resolve="Node" />
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkj6" role="3AunhB">
+                        <ref role="a7OzE" node="tbauFybkiD" resolve="B" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3Aq9E8" id="tbauFybkj7" role="3xSepj">
+                <node concept="3I6sU6" id="tbauFybkj8" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="tbauFybkj9" role="3I6sU7">
+                    <node concept="3A8Hvi" id="tbauFybkja" role="3I6s78">
+                      <node concept="37jhX" id="tbauFybkjb" role="3A8wtg">
+                        <node concept="1nq8_$" id="tbauFybkjc" role="37jj2">
+                          <node concept="37jhX" id="tbauFybkjd" role="1nq8_t">
+                            <node concept="2OqwBi" id="tbauFybkje" role="37jj2">
+                              <node concept="KwDlU" id="tbauFybkjf" role="2Oq$k0" />
+                              <node concept="liA8E" id="tbauFybkjg" role="2OqNvi">
+                                <ref role="37wK5l" to="tj24:5EDW3XDYO56" resolve="getResult" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="tbauFybkjh" role="3A8w4Q">
+                        <ref role="a7OzE" node="tbauFybkiG" resolve="Node" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>