diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 418b67f2..23deac41 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -163,6 +163,7 @@
         <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
       </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" />
       </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
@@ -747,6 +748,7 @@
     </node>
     <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">
@@ -1312,6 +1314,7 @@
     </node>
     <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">
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index ccc57616..4ff15be5 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -89,6 +89,7 @@
         <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
       </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" />
       </concept>
       <concept id="861509610434243104" name="jetbrains.mps.lang.coderules.structure.TermTable" flags="ng" index="ns1xd">
@@ -550,6 +551,7 @@
     </node>
     <node concept="2bWyPT" id="2rdxkKxrXzd" role="92CTm">
       <property role="TrG5h" value="checkAll" />
+      <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">
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 1d01696e..efe1d009 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -383,6 +383,7 @@
       </concept>
       <concept id="6928531011218148071" name="jetbrains.mps.lang.coderules.structure.IsboundVariableConstraint" flags="ng" index="2aM9Np" />
       <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" />
       </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
@@ -7402,6 +7403,7 @@
     </node>
     <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">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 2f223aa4..50d98489 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -249,6 +249,7 @@
       </concept>
       <concept id="6928531011218148071" name="jetbrains.mps.lang.coderules.structure.IsboundVariableConstraint" flags="ng" index="2aM9Np" />
       <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" />
       </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
@@ -334,6 +335,7 @@
     <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">
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 a0663f3b..44554b3c 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
@@ -663,6 +663,7 @@
       </concept>
       <concept id="6928531011218148071" name="jetbrains.mps.lang.coderules.structure.IsboundVariableConstraint" flags="ng" index="2aM9Np" />
       <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" />
       </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
@@ -32458,6 +32459,7 @@
     </node>
     <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">
@@ -32515,6 +32517,7 @@
     </node>
     <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">
@@ -32533,12 +32536,12 @@
                   <node concept="3I6s7M" id="6OXbTD$fttJ" role="3I6sU7">
                     <node concept="3jbYBd" id="5itBwMb5r7w" role="3I6s78">
                       <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                      <node concept="2_cIyK" id="2BZXJecXiSC" role="3jbY8P">
-                        <ref role="2_cIwb" node="2BZXJecOMap" resolve="from" />
-                      </node>
                       <node concept="a7P8L" id="6OXbTD$fttL" role="3jbY8V">
                         <ref role="a7OzE" node="6OXbTD$fttX" resolve="A" />
                       </node>
+                      <node concept="2_cIyK" id="5EDW3XEeTty" role="3jbY8P">
+                        <ref role="2_cIwb" node="2BZXJecOMap" resolve="from" />
+                      </node>
                     </node>
                   </node>
                   <node concept="3I6s7M" id="6OXbTD$fttN" role="3I6sU7">
@@ -38296,6 +38299,7 @@
     <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">