diff --git a/build.xml b/build.xml
index 819817ca..06cf0e69 100644
--- a/build.xml
+++ b/build.xml
@@ -1639,6 +1639,7 @@
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
           <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
           <language id="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
@@ -3449,6 +3450,7 @@
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
           <language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
           <language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+          <language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
           <language id="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index da090a1c..1059798c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -13315,6 +13315,69 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="2tJIrI" id="5EDW3XEgAEx" role="jymVt" />
+      <node concept="3clFb_" id="5EDW3XEgG0b" role="jymVt">
+        <property role="TrG5h" value="withQuery" />
+        <node concept="3Tm1VV" id="5EDW3XEgG0d" role="1B3o_S" />
+        <node concept="3uibUv" id="5EDW3XEgG0e" role="3clF45">
+          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+        </node>
+        <node concept="37vLTG" id="5EDW3XEgG0f" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="5EDW3XEh098" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <node concept="1ZhdrF" id="5EDW3XEh099" role="lGtFl">
+              <property role="2qtEX8" value="classifier" />
+              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+              <node concept="3$xsQk" id="5EDW3XEh09a" role="3$ytzL">
+                <node concept="3clFbS" id="5EDW3XEh09b" role="2VODD2">
+                  <node concept="3clFbF" id="5EDW3XEh09c" role="3cqZAp">
+                    <node concept="2OqwBi" id="5EDW3XEh09d" role="3clFbG">
+                      <node concept="1PxgMI" id="5EDW3XEh09e" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="5EDW3XEh09f" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+                        </node>
+                        <node concept="2OqwBi" id="5EDW3XEh09g" role="1m5AlR">
+                          <node concept="1iwH7S" id="5EDW3XEh09h" role="2Oq$k0" />
+                          <node concept="12$id9" id="5EDW3XEh09i" role="2OqNvi">
+                            <node concept="30H73N" id="5EDW3XEh09j" role="12$y8L" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrEf2" id="5EDW3XEh09k" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbS" id="5EDW3XEgG0i" role="3clF47">
+          <node concept="3clFbF" id="5EDW3XEzeJY" role="3cqZAp">
+            <node concept="37vLTI" id="5EDW3XEzeK0" role="3clFbG">
+              <node concept="2OqwBi" id="5EDW3XEzgOP" role="37vLTJ">
+                <node concept="Xjq3P" id="5EDW3XEzgZI" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5EDW3XEzgOS" role="2OqNvi">
+                  <ref role="2Oxat5" node="5EDW3XEzeJI" resolve="query" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="5EDW3XEzeK4" role="37vLTx">
+                <ref role="3cqZAo" node="5EDW3XEgG0f" resolve="query" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5EDW3XEznvY" role="3cqZAp">
+            <node concept="Xjq3P" id="5EDW3XEznvW" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5EDW3XEgG0j" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5EDW3XEgGO8" role="jymVt" />
       <node concept="3clFb_" id="6tPOoeT3Z2J" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="apply" />
@@ -13505,6 +13568,43 @@
           </node>
         </node>
       </node>
+      <node concept="312cEg" id="5EDW3XEzeJI" role="jymVt">
+        <property role="TrG5h" value="query" />
+        <node concept="3Tmbuc" id="5EDW3XECi6j" role="1B3o_S" />
+        <node concept="3uibUv" id="5EDW3XEzeJL" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <node concept="1ZhdrF" id="5EDW3XEzeJM" role="lGtFl">
+            <property role="2qtEX8" value="classifier" />
+            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+            <node concept="3$xsQk" id="5EDW3XEzeJN" role="3$ytzL">
+              <node concept="3clFbS" id="5EDW3XEzeJO" role="2VODD2">
+                <node concept="3clFbF" id="5EDW3XEzeJP" role="3cqZAp">
+                  <node concept="2OqwBi" id="5EDW3XEzeJQ" role="3clFbG">
+                    <node concept="1PxgMI" id="5EDW3XEzeJR" role="2Oq$k0">
+                      <property role="1BlNFB" value="true" />
+                      <node concept="chp4Y" id="5EDW3XEzeJS" role="3oSUPX">
+                        <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+                      </node>
+                      <node concept="2OqwBi" id="5EDW3XEzeJT" role="1m5AlR">
+                        <node concept="1iwH7S" id="5EDW3XEzeJU" role="2Oq$k0" />
+                        <node concept="12$id9" id="5EDW3XEzeJV" role="2OqNvi">
+                          <node concept="30H73N" id="5EDW3XEzeJW" role="12$y8L" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="5EDW3XEzeJX" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2ZBi8u" id="5EDW3XEzlVK" role="lGtFl">
+          <ref role="2rW$FS" node="5EDW3XEzky_" resolve="query_field" />
+        </node>
+      </node>
       <node concept="312cEg" id="6tPOoeT3Z41" role="jymVt">
         <property role="TrG5h" value="ruleBuilders" />
         <node concept="3Tmbuc" id="6tPOoeT3Z42" role="1B3o_S" />
@@ -13531,6 +13631,36 @@
       <node concept="3Tm1VV" id="6tPOoeT3Z48" role="1B3o_S" />
       <node concept="3uibUv" id="6R6MIbUe0_f" role="EKbjA">
         <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+        <node concept="3uibUv" id="5EDW3XEgQpw" role="11_B2D">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          <node concept="1ZhdrF" id="5EDW3XEgQZ6" role="lGtFl">
+            <property role="2qtEX8" value="classifier" />
+            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+            <node concept="3$xsQk" id="5EDW3XEgQZ7" role="3$ytzL">
+              <node concept="3clFbS" id="5EDW3XEgQZ8" role="2VODD2">
+                <node concept="3clFbF" id="5EDW3XEgRqh" role="3cqZAp">
+                  <node concept="2OqwBi" id="5EDW3XEgZ1k" role="3clFbG">
+                    <node concept="1PxgMI" id="5EDW3XEgXUE" role="2Oq$k0">
+                      <property role="1BlNFB" value="true" />
+                      <node concept="chp4Y" id="5EDW3XEgYmr" role="3oSUPX">
+                        <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+                      </node>
+                      <node concept="2OqwBi" id="5EDW3XEgSjB" role="1m5AlR">
+                        <node concept="1iwH7S" id="5EDW3XEgRqg" role="2Oq$k0" />
+                        <node concept="12$id9" id="5EDW3XEgSKt" role="2OqNvi">
+                          <node concept="30H73N" id="5EDW3XEgTL0" role="12$y8L" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="5EDW3XEgZF1" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1WS0z7" id="6tPOoeT5Mwz" role="lGtFl">
         <node concept="3JmXsc" id="6tPOoeT5Mw_" role="3Jn$fo">
@@ -13583,7 +13713,7 @@
     </node>
     <node concept="2tJIrI" id="4t7Xo7icolH" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XE0F7L" role="jymVt">
-      <property role="TrG5h" value="queryClass" />
+      <property role="TrG5h" value="queryType" />
       <node concept="3Tm1VV" id="5EDW3XE0F7N" role="1B3o_S" />
       <node concept="3uibUv" id="5EDW3XE0F7O" role="3clF45">
         <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
@@ -13594,8 +13724,45 @@
         </node>
       </node>
       <node concept="3clFbS" id="5EDW3XE0F7U" role="3clF47">
-        <node concept="3clFbF" id="5EDW3XE6x5r" role="3cqZAp">
-          <node concept="10Nm6u" id="5EDW3XE6x5q" role="3clFbG" />
+        <node concept="3clFbF" id="5EDW3XEzG_s" role="3cqZAp">
+          <node concept="3VsKOn" id="5EDW3XEzGU2" role="3clFbG">
+            <ref role="3VsUkX" to="i348:5EDW3XDYeWv" resolve="Query" />
+            <node concept="1ZhdrF" id="5EDW3XEzHbM" role="lGtFl">
+              <property role="2qtEX8" value="classifier" />
+              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
+              <node concept="3$xsQk" id="5EDW3XEzHbN" role="3$ytzL">
+                <node concept="3clFbS" id="5EDW3XEzHbO" role="2VODD2">
+                  <node concept="3clFbF" id="5EDW3XEzHHF" role="3cqZAp">
+                    <node concept="2OqwBi" id="5EDW3XEzUoL" role="3clFbG">
+                      <node concept="2OqwBi" id="5EDW3XEzPsr" role="2Oq$k0">
+                        <node concept="2OqwBi" id="5EDW3XEzLg_" role="2Oq$k0">
+                          <node concept="1PxgMI" id="5EDW3XEzKYv" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="5EDW3XEzL0w" role="3oSUPX">
+                              <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+                            </node>
+                            <node concept="2OqwBi" id="5EDW3XEzHSW" role="1m5AlR">
+                              <node concept="1iwH7S" id="5EDW3XEzHHE" role="2Oq$k0" />
+                              <node concept="12$id9" id="5EDW3XEzHZ4" role="2OqNvi">
+                                <node concept="30H73N" id="5EDW3XEzI61" role="12$y8L" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3Tsc0h" id="5EDW3XEzLrx" role="2OqNvi">
+                            <ref role="3TtcxE" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
+                          </node>
+                        </node>
+                        <node concept="1uHKPH" id="5EDW3XEzRHv" role="2OqNvi" />
+                      </node>
+                      <node concept="3TrEf2" id="5EDW3XEzUGV" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:5EDW3XE6suU" resolve="queryType" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="5EDW3XE0F7V" role="2AJF6D">
@@ -13791,11 +13958,76 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="5EDW3XECeNm" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:5EDW3XEaQl5" resolve="QueryParameter" />
+      <node concept="1Koe21" id="5EDW3XECeR9" role="1lVwrX">
+        <node concept="312cEu" id="5EDW3XEChWG" role="1Koe22">
+          <property role="TrG5h" value="Token" />
+          <node concept="2tJIrI" id="5EDW3XEChZ6" role="jymVt" />
+          <node concept="312cEg" id="5EDW3XECi00" role="jymVt">
+            <property role="TrG5h" value="query" />
+            <node concept="3Tmbuc" id="5EDW3XECiGe" role="1B3o_S" />
+            <node concept="3uibUv" id="5EDW3XECjsb" role="1tU5fm">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5EDW3XECk_x" role="jymVt" />
+          <node concept="3clFb_" id="5EDW3XECkC0" role="jymVt">
+            <property role="TrG5h" value="context" />
+            <node concept="3uibUv" id="5EDW3XECkGd" role="3clF45">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+            <node concept="3Tm6S6" id="5EDW3XECkC3" role="1B3o_S" />
+            <node concept="3clFbS" id="5EDW3XECkC4" role="3clF47">
+              <node concept="3clFbF" id="5EDW3XECjsU" role="3cqZAp">
+                <node concept="37vLTw" id="5EDW3XECjsT" role="3clFbG">
+                  <ref role="3cqZAo" node="5EDW3XECi00" resolve="query" />
+                  <node concept="raruj" id="5EDW3XECjtT" role="lGtFl" />
+                  <node concept="1ZhdrF" id="5EDW3XECju3" role="lGtFl">
+                    <property role="2qtEX8" value="variableDeclaration" />
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                    <node concept="3$xsQk" id="5EDW3XECju4" role="3$ytzL">
+                      <node concept="3clFbS" id="5EDW3XECju5" role="2VODD2">
+                        <node concept="3clFbF" id="5EDW3XECjwM" role="3cqZAp">
+                          <node concept="2OqwBi" id="5EDW3XECjHo" role="3clFbG">
+                            <node concept="1iwH7S" id="5EDW3XECjwL" role="2Oq$k0" />
+                            <node concept="1iwH70" id="5EDW3XECjMM" role="2OqNvi">
+                              <ref role="1iwH77" node="5EDW3XEzky_" resolve="query_field" />
+                              <node concept="2OqwBi" id="5EDW3XECk7s" role="1iwH7V">
+                                <node concept="30H73N" id="5EDW3XECjWr" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="5EDW3XECkhj" role="2OqNvi">
+                                  <node concept="1xMEDy" id="5EDW3XECkhl" role="1xVPHs">
+                                    <node concept="chp4Y" id="5EDW3XECkn7" role="ri$Ld">
+                                      <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5EDW3XEChZb" role="jymVt" />
+          <node concept="3Tm6S6" id="5EDW3XEChYL" role="1B3o_S" />
+        </node>
+      </node>
+    </node>
     <node concept="2rT7sh" id="2BZXJecSPIi" role="2rTMjI">
       <property role="TrG5h" value="query_parameter" />
       <ref role="2rTdP9" to="wq2x:2BZXJecNbEw" resolve="QueryParameterDeclaration" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
     </node>
+    <node concept="2rT7sh" id="5EDW3XEzky_" role="2rTMjI">
+      <property role="TrG5h" value="query_field" />
+      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+      <ref role="2rTdP9" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+    </node>
   </node>
   <node concept="312cEu" id="7km57PkeUQV">
     <property role="TrG5h" value="AspectDescriptor" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 118ae83c..010e8595 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -70,7 +70,7 @@
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
-      <concept id="1153952380246" name="jetbrains.mps.baseLanguage.structure.TryFinallyStatement" flags="nn" index="2GUZhq">
+      <concept id="1153952380246" name="jetbrains.mps.baseLanguage.structure.TryStatement" flags="nn" index="2GUZhq">
         <child id="1153952416686" name="body" index="2GV8ay" />
         <child id="1153952429843" name="finallyBody" index="2GVbov" />
         <child id="1164903700860" name="catchClause" index="TEXxN" />
@@ -6638,12 +6638,10 @@
           <node concept="3Tqbb2" id="7kTeLbPolyb" role="A3Ik2" />
         </node>
       </node>
-      <node concept="37vLTG" id="6OXbTDxuNC6" role="3clF46">
-        <property role="TrG5h" value="queryParameter" />
-        <node concept="8X2XB" id="6OXbTDxuUTL" role="1tU5fm">
-          <node concept="3uibUv" id="6OXbTDxuTvz" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEu33d" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEu3xO" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="7kTeLbPojCE" role="3clF47">
@@ -6693,11 +6691,24 @@
                               </node>
                               <node concept="liA8E" id="6OXbTDxPqb1" role="2OqNvi">
                                 <ref role="37wK5l" to="ksgm:6OXbTDxOzxt" resolve="processQuery" />
-                                <node concept="37vLTw" id="cmlg9OIEav" role="37wK5m">
-                                  <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+                                <node concept="10QFUN" id="5EDW3XEx1PL" role="37wK5m">
+                                  <node concept="37vLTw" id="5EDW3XEx1PK" role="10QFUP">
+                                    <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+                                  </node>
+                                  <node concept="3uibUv" id="5EDW3XEx1PF" role="10QFUM">
+                                    <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                                    <node concept="16syzq" id="5EDW3XEx26X" role="11_B2D">
+                                      <ref role="16sUi3" node="6OXbTDyaL_y" resolve="T" />
+                                    </node>
+                                  </node>
                                 </node>
-                                <node concept="37vLTw" id="6OXbTDxPqhF" role="37wK5m">
-                                  <ref role="3cqZAo" node="6OXbTDxuNC6" resolve="queryParameter" />
+                                <node concept="10QFUN" id="5EDW3XEx_GG" role="37wK5m">
+                                  <node concept="37vLTw" id="5EDW3XEx_GF" role="10QFUP">
+                                    <ref role="3cqZAo" node="5EDW3XEu33d" resolve="query" />
+                                  </node>
+                                  <node concept="16syzq" id="5EDW3XExAo6" role="10QFUM">
+                                    <ref role="16sUi3" node="5EDW3XEvo5m" resolve="Q" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -6758,6 +6769,21 @@
           <node concept="1dT_AC" id="7kTeLbPojD1" role="1dT_Ay" />
         </node>
       </node>
+      <node concept="16euLQ" id="5EDW3XEvo5m" role="16eVyc">
+        <property role="TrG5h" value="Q" />
+        <node concept="3uibUv" id="5EDW3XEvwaZ" role="3ztrMU">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="6OXbTDyaL_y" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="6R6MIbUdgwE" role="3ztrMU">
+          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <node concept="16syzq" id="5EDW3XEvy57" role="11_B2D">
+            <ref role="16sUi3" node="5EDW3XEvo5m" resolve="Q" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7kTeLbPorJ7" role="jymVt" />
     <node concept="3clFb_" id="3GlpCDSyO$P" role="jymVt">
@@ -8073,6 +8099,37 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4t7Xo7inmSi" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XEzBxY" role="jymVt">
+      <property role="TrG5h" value="byQueryType" />
+      <node concept="37vLTG" id="5EDW3XEzBxZ" role="3clF46">
+        <property role="TrG5h" value="queryType" />
+        <node concept="3uibUv" id="5EDW3XE$fJ2" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qUE_q" id="5EDW3XE$fMP" role="11_B2D">
+            <node concept="3uibUv" id="5EDW3XE$fVy" role="3qUE_r">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="5EDW3XEzBy1" role="3clF45">
+        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XEzBy2" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XEzBy3" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XEzBy4" role="3cqZAp">
+          <node concept="3EllGN" id="5EDW3XEzBy5" role="3clFbG">
+            <node concept="37vLTw" id="5EDW3XEzBy6" role="3ElVtu">
+              <ref role="3cqZAo" node="5EDW3XEzBxZ" resolve="queryType" />
+            </node>
+            <node concept="37vLTw" id="5EDW3XEzDYk" role="3ElQJh">
+              <ref role="3cqZAo" node="5EDW3XEzD6r" resolve="queryType2queryTemplate" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5EDW3XEzBxX" role="jymVt" />
     <node concept="3clFb_" id="7WKNeR98sU4" role="jymVt">
       <property role="TrG5h" value="ruleTemplates" />
       <node concept="37vLTG" id="7WKNeR98uXx" role="3clF46">
@@ -8248,6 +8305,80 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbJ" id="5EDW3XEzVaD" role="3cqZAp">
+              <node concept="3clFbS" id="5EDW3XEzVaE" role="3clFbx">
+                <node concept="3clFbJ" id="5EDW3XEzVaF" role="3cqZAp">
+                  <node concept="3clFbS" id="5EDW3XEzVaG" role="3clFbx">
+                    <node concept="YS8fn" id="5EDW3XEzVaH" role="3cqZAp">
+                      <node concept="2ShNRf" id="5EDW3XEzVaI" role="YScLw">
+                        <node concept="1pGfFk" id="5EDW3XEzVaJ" role="2ShVmc">
+                          <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+                          <node concept="3cpWs3" id="5EDW3XEzVaK" role="37wK5m">
+                            <node concept="2OqwBi" id="5EDW3XEzVaL" role="3uHU7w">
+                              <node concept="2GrUjf" id="5EDW3XEzVaM" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                              </node>
+                              <node concept="liA8E" id="5EDW3XEzW1N" role="2OqNvi">
+                                <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                              </node>
+                            </node>
+                            <node concept="Xl_RD" id="5EDW3XEzVaO" role="3uHU7B">
+                              <property role="Xl_RC" value="conflicting queries of kind: " />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5EDW3XEzVaP" role="3clFbw">
+                    <node concept="37vLTw" id="5EDW3XEzVMl" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5EDW3XEzD6r" resolve="queryType2queryTemplate" />
+                    </node>
+                    <node concept="2Nt0df" id="5EDW3XEzVaR" role="2OqNvi">
+                      <node concept="2OqwBi" id="5EDW3XEzVaS" role="38cxEo">
+                        <node concept="2GrUjf" id="5EDW3XEzVaT" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                        </node>
+                        <node concept="liA8E" id="5EDW3XEzVRf" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="5EDW3XEzVaV" role="3cqZAp">
+                  <node concept="37vLTI" id="5EDW3XEzVaW" role="3clFbG">
+                    <node concept="2GrUjf" id="5EDW3XEzVaX" role="37vLTx">
+                      <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                    </node>
+                    <node concept="3EllGN" id="5EDW3XEzVaY" role="37vLTJ">
+                      <node concept="2OqwBi" id="5EDW3XEzVaZ" role="3ElVtu">
+                        <node concept="2GrUjf" id="5EDW3XEzVb0" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                        </node>
+                        <node concept="liA8E" id="5EDW3XEzWuc" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="5EDW3XEzWar" role="3ElQJh">
+                        <ref role="3cqZAo" node="5EDW3XEzD6r" resolve="queryType2queryTemplate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="5EDW3XEzVb3" role="3clFbw">
+                <node concept="10Nm6u" id="5EDW3XEzVb4" role="3uHU7w" />
+                <node concept="2OqwBi" id="5EDW3XEzVb5" role="3uHU7B">
+                  <node concept="2GrUjf" id="5EDW3XEzVb6" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                  </node>
+                  <node concept="liA8E" id="5EDW3XEzVHj" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:5EDW3XE0DF4" resolve="queryType" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbH" id="6OXbTD$owiJ" role="3cqZAp" />
             <node concept="3cpWs8" id="6OXbTD$o4WA" role="3cqZAp">
               <node concept="3cpWsn" id="6OXbTD$o4WB" role="3cpWs9">
@@ -8336,6 +8467,30 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="5EDW3XEzD6r" role="jymVt">
+      <property role="TrG5h" value="queryType2queryTemplate" />
+      <node concept="3Tm6S6" id="5EDW3XEzD6s" role="1B3o_S" />
+      <node concept="3rvAFt" id="5EDW3XEzD6t" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XE$c89" role="3rvQeY">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qTvmN" id="5EDW3XE$cIT" role="11_B2D" />
+        </node>
+        <node concept="3uibUv" id="5EDW3XEzD6v" role="3rvSg0">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="5EDW3XEzD6w" role="33vP2m">
+        <node concept="3rGOSV" id="5EDW3XEzD6x" role="2ShVmc">
+          <node concept="3uibUv" id="5EDW3XE$dak" role="3rHrn6">
+            <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+            <node concept="3qTvmN" id="5EDW3XE$dNw" role="11_B2D" />
+          </node>
+          <node concept="3uibUv" id="5EDW3XEzD6z" role="3rHtpV">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="312cEg" id="7WKNeR97s2V" role="jymVt">
       <property role="TrG5h" value="queryTemplateFqname2index" />
       <node concept="3Tm6S6" id="7WKNeR97s2W" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index d95848b2..4deaa5a8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -48,9 +48,6 @@
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
-        <child id="1219921048460" name="componentType" index="8Xvag" />
-      </concept>
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
@@ -5162,14 +5159,15 @@
         <property role="TrG5h" value="queryTemplate" />
         <node concept="3uibUv" id="cmlg9OI$gY" role="1tU5fm">
           <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <node concept="16syzq" id="5EDW3XEwYlf" role="11_B2D">
+            <ref role="16sUi3" node="5EDW3XEwI2k" resolve="T" />
+          </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6OXbTDxP7qn" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="8X2XB" id="6OXbTDxPb_p" role="1tU5fm">
-          <node concept="3uibUv" id="6OXbTDxPbo6" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEuhZd" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="16syzq" id="5EDW3XExFLR" role="1tU5fm">
+          <ref role="16sUi3" node="5EDW3XEwI2i" resolve="Q" />
         </node>
       </node>
       <node concept="3uibUv" id="6OXbTDxOCKa" role="3clF45">
@@ -5204,8 +5202,8 @@
                       <node concept="37vLTw" id="cmlg9OIGvM" role="37wK5m">
                         <ref role="3cqZAo" node="cmlg9OIsrb" resolve="queryTemplate" />
                       </node>
-                      <node concept="37vLTw" id="6OXbTDyhxR8" role="37wK5m">
-                        <ref role="3cqZAo" node="6OXbTDxP7qn" resolve="parameter" />
+                      <node concept="37vLTw" id="5EDW3XEurPf" role="37wK5m">
+                        <ref role="3cqZAo" node="5EDW3XEuhZd" resolve="query" />
                       </node>
                     </node>
                   </node>
@@ -5231,6 +5229,21 @@
           </node>
         </node>
       </node>
+      <node concept="16euLQ" id="5EDW3XEwI2i" role="16eVyc">
+        <property role="TrG5h" value="Q" />
+        <node concept="3uibUv" id="5EDW3XEwI2j" role="3ztrMU">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="5EDW3XEwI2k" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="5EDW3XEwI2l" role="3ztrMU">
+          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <node concept="16syzq" id="5EDW3XEwI2m" role="11_B2D">
+            <ref role="16sUi3" node="5EDW3XEwI2i" resolve="Q" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6OXbTDzRR6o" role="jymVt" />
     <node concept="3clFb_" id="4QPCta1aZLs" role="jymVt">
@@ -5890,12 +5903,10 @@
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6OXbTDycbjU" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="8X2XB" id="6OXbTDycfvT" role="1tU5fm">
-          <node concept="3uibUv" id="6OXbTDycfht" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEuKDu" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="16syzq" id="5EDW3XEvDel" role="1tU5fm">
+          <ref role="16sUi3" node="5EDW3XEvo5m" resolve="Q" />
         </node>
       </node>
       <node concept="3clFbS" id="6OXbTDyaL$2" role="3clF47">
@@ -5924,9 +5935,9 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="6R6MIbUuWzv" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:5itBwM86qEL" resolve="withParam" />
-                        <node concept="37vLTw" id="6R6MIbUuWzw" role="37wK5m">
-                          <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
+                        <ref role="37wK5l" to="i348:5EDW3XEg_7p" resolve="withQuery" />
+                        <node concept="37vLTw" id="5EDW3XEvNP2" role="37wK5m">
+                          <ref role="3cqZAo" node="5EDW3XEuKDu" resolve="query" />
                         </node>
                       </node>
                     </node>
@@ -5966,8 +5977,8 @@
                   <node concept="2YIFZM" id="6OXbTDycVSX" role="33vP2m">
                     <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <node concept="37vLTw" id="6OXbTDyd7qU" role="37wK5m">
-                      <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
+                    <node concept="37vLTw" id="5EDW3XEw2oU" role="37wK5m">
+                      <ref role="3cqZAo" node="5EDW3XEuKDu" resolve="query" />
                     </node>
                   </node>
                 </node>
@@ -6022,10 +6033,19 @@
           </node>
         </node>
       </node>
+      <node concept="16euLQ" id="5EDW3XEvo5m" role="16eVyc">
+        <property role="TrG5h" value="Q" />
+        <node concept="3uibUv" id="5EDW3XEvwaZ" role="3ztrMU">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
       <node concept="16euLQ" id="6OXbTDyaL_y" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6R6MIbUdgwE" role="3ztrMU">
           <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <node concept="16syzq" id="5EDW3XEvy57" role="11_B2D">
+            <ref role="16sUi3" node="5EDW3XEvo5m" resolve="Q" />
+          </node>
         </node>
       </node>
     </node>
@@ -7064,8 +7084,8 @@
                   <node concept="37vLTw" id="6tPOoeT4SaD" role="37wK5m">
                     <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="queryTemplate" />
                   </node>
-                  <node concept="37vLTw" id="6OXbTDydyO0" role="37wK5m">
-                    <ref role="3cqZAo" node="6OXbTDyaDvN" resolve="parameter" />
+                  <node concept="37vLTw" id="5EDW3XEuGAn" role="37wK5m">
+                    <ref role="3cqZAo" node="5EDW3XEuyBX" resolve="query" />
                   </node>
                 </node>
               </node>
@@ -7307,8 +7327,8 @@
                           <node concept="2YIFZM" id="6OXbTDyeyio" role="33vP2m">
                             <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                            <node concept="37vLTw" id="6OXbTDyeyYP" role="37wK5m">
-                              <ref role="3cqZAo" node="6OXbTDyaDvN" resolve="parameter" />
+                            <node concept="37vLTw" id="5EDW3XEuIQB" role="37wK5m">
+                              <ref role="3cqZAo" node="5EDW3XEuyBX" resolve="query" />
                             </node>
                           </node>
                         </node>
@@ -7429,13 +7449,29 @@
         <property role="TrG5h" value="queryTemplate" />
         <node concept="3uibUv" id="6tPOoeT4z8$" role="1tU5fm">
           <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          <node concept="16syzq" id="5EDW3XEwzKu" role="11_B2D">
+            <ref role="16sUi3" node="5EDW3XEwksj" resolve="T" />
+          </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6OXbTDyaDvN" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="8X2XB" id="6OXbTDyaGSr" role="1tU5fm">
-          <node concept="3uibUv" id="6OXbTDyaDvM" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      <node concept="37vLTG" id="5EDW3XEuyBX" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="16syzq" id="5EDW3XExHCy" role="1tU5fm">
+          <ref role="16sUi3" node="5EDW3XEwksh" resolve="Q" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="5EDW3XEwksh" role="16eVyc">
+        <property role="TrG5h" value="Q" />
+        <node concept="3uibUv" id="5EDW3XEwksi" role="3ztrMU">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="5EDW3XEwksj" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="5EDW3XEwksk" role="3ztrMU">
+          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+          <node concept="16syzq" id="5EDW3XEwksl" role="11_B2D">
+            <ref role="16sUi3" node="5EDW3XEwksh" resolve="Q" />
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
index 34cc51ed..1213ddbd 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps
@@ -87,9 +87,6 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -224,6 +221,7 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -560,9 +558,20 @@
                       <node concept="37vLTw" id="2Y70AYEcq0D" role="37wK5m">
                         <ref role="3cqZAo" node="2Y70AYEbnBV" resolve="errorMsgHandler" />
                       </node>
-                      <node concept="10M0yZ" id="tyIfzC5MVS" role="37wK5m">
-                        <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
-                        <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                      <node concept="2YIFZM" id="5EDW3XEUzwx" role="37wK5m">
+                        <ref role="37wK5l" to="tj24:5EDW3XDYggE" resolve="check" />
+                        <ref role="1Pybhc" to="tj24:5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                        <node concept="1bVj0M" id="5EDW3XEUz_T" role="37wK5m">
+                          <node concept="37vLTG" id="5EDW3XEUzG1" role="1bW2Oz">
+                            <property role="TrG5h" value="p" />
+                            <node concept="2sp9CU" id="5EDW3XEUzMj" role="1tU5fm" />
+                          </node>
+                          <node concept="37vLTG" id="5EDW3XEUzWk" role="1bW2Oz">
+                            <property role="TrG5h" value="n" />
+                            <node concept="3Tqbb2" id="5EDW3XEU$5C" role="1tU5fm" />
+                          </node>
+                          <node concept="3clFbS" id="5EDW3XEUz_U" role="1bW5cS" />
+                        </node>
                       </node>
                     </node>
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
index 6cc0b3a3..784b1f6f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
@@ -425,9 +425,20 @@
                 <node concept="37vLTw" id="2Y70AYEczyJ" role="37wK5m">
                   <ref role="3cqZAo" node="2Y70AYEbnBV" resolve="nullHandler" />
                 </node>
-                <node concept="10M0yZ" id="2FNFm8neJ$3" role="37wK5m">
-                  <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
-                  <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                <node concept="2YIFZM" id="5EDW3XEU_wD" role="37wK5m">
+                  <ref role="37wK5l" to="tj24:5EDW3XDYggE" resolve="check" />
+                  <ref role="1Pybhc" to="tj24:5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                  <node concept="1bVj0M" id="5EDW3XEU_Gm" role="37wK5m">
+                    <node concept="37vLTG" id="5EDW3XEU_Ou" role="1bW2Oz">
+                      <property role="TrG5h" value="p" />
+                      <node concept="2sp9CU" id="5EDW3XEU_XO" role="1tU5fm" />
+                    </node>
+                    <node concept="37vLTG" id="5EDW3XEUA7b" role="1bW2Oz">
+                      <property role="TrG5h" value="n" />
+                      <node concept="3Tqbb2" id="5EDW3XEUAjy" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="5EDW3XEU_Gn" role="1bW5cS" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -615,9 +626,9 @@
         </node>
       </node>
       <node concept="37vLTG" id="tyIfzC106r" role="3clF46">
-        <property role="TrG5h" value="qkind" />
-        <node concept="3uibUv" id="tyIfzC107w" role="1tU5fm">
-          <ref role="3uigEE" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEU$Nj" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3cqZAl" id="tyIfzC0ZVs" role="3clF45" />
@@ -779,9 +790,14 @@
                 </node>
               </node>
               <node concept="liA8E" id="6OXbTD_oqun" role="2OqNvi">
-                <ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
-                <node concept="37vLTw" id="tyIfzC2u9A" role="37wK5m">
-                  <ref role="3cqZAo" node="tyIfzC106r" resolve="qkind" />
+                <ref role="37wK5l" to="hano:5EDW3XEzBxY" resolve="byQueryType" />
+                <node concept="2OqwBi" id="5EDW3XEUAYF" role="37wK5m">
+                  <node concept="37vLTw" id="tyIfzC2u9A" role="2Oq$k0">
+                    <ref role="3cqZAo" node="tyIfzC106r" resolve="query" />
+                  </node>
+                  <node concept="liA8E" id="5EDW3XEUB6P" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:5EDW3XE$mhS" resolve="type" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1516,8 +1532,12 @@
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="5fMWD6IorqM" role="37wK5m">
-                <ref role="3cqZAo" node="5fMWD6Iop7s" resolve="typeCollector" />
+              <node concept="2YIFZM" id="5EDW3XEzxoX" role="37wK5m">
+                <ref role="37wK5l" to="tj24:5EDW3XDYggE" resolve="check" />
+                <ref role="1Pybhc" to="tj24:5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                <node concept="37vLTw" id="5fMWD6IorqM" role="37wK5m">
+                  <ref role="3cqZAo" node="5fMWD6Iop7s" resolve="typeCollector" />
+                </node>
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 21ae1e05..77cb6ffb 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -222,6 +222,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
@@ -1117,10 +1120,9 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="6OXbTD_oqun" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
-                      <node concept="10M0yZ" id="4RzhaQIJMWT" role="37wK5m">
-                        <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
-                        <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                      <ref role="37wK5l" to="hano:5EDW3XEzBxY" resolve="byQueryType" />
+                      <node concept="3VsKOn" id="5EDW3XEUDys" role="37wK5m">
+                        <ref role="3VsUkX" to="tj24:5EDW3XDYNPr" resolve="CheckQuery" />
                       </node>
                     </node>
                   </node>
@@ -1265,8 +1267,12 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="37vLTw" id="7gOEBI$hjpf" role="37wK5m">
-                        <ref role="3cqZAo" node="7gOEBI$hd0J" resolve="typeCollector" />
+                      <node concept="2YIFZM" id="5EDW3XEzAnI" role="37wK5m">
+                        <ref role="37wK5l" to="tj24:5EDW3XDYggE" resolve="check" />
+                        <ref role="1Pybhc" to="tj24:5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                        <node concept="37vLTw" id="7gOEBI$hjpf" role="37wK5m">
+                          <ref role="3cqZAo" node="7gOEBI$hd0J" resolve="typeCollector" />
+                        </node>
                       </node>
                     </node>
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 5cccd9d8..118cc0dc 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -2184,10 +2184,10 @@
     <node concept="2tJIrI" id="7WKNeR8RgMN" role="jymVt" />
     <node concept="2YIFZL" id="7WKNeR8SP2E" role="jymVt">
       <property role="TrG5h" value="launchQuery" />
-      <node concept="37vLTG" id="7WKNeR9gygX" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="2Mi2iz0OnfF" role="1tU5fm">
-          <ref role="3uigEE" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+      <node concept="37vLTG" id="5EDW3XEpvo4" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEpvC1" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="37vLTG" id="7WKNeR8SP2H" role="3clF46">
@@ -2217,8 +2217,8 @@
           <node concept="2ShNRf" id="7WKNeR8SP2R" role="3clFbG">
             <node concept="1pGfFk" id="7WKNeR8SP2S" role="2ShVmc">
               <ref role="37wK5l" node="7WKNeR8SQxi" resolve="TypecheckingActions.LaunchQuery" />
-              <node concept="37vLTw" id="7WKNeR9gzZ3" role="37wK5m">
-                <ref role="3cqZAo" node="7WKNeR9gygX" resolve="queryKind" />
+              <node concept="37vLTw" id="5EDW3XEpw0l" role="37wK5m">
+                <ref role="3cqZAo" node="5EDW3XEpvo4" resolve="query" />
               </node>
               <node concept="37vLTw" id="7WKNeR8SP2U" role="37wK5m">
                 <ref role="3cqZAo" node="7WKNeR8SP2H" resolve="editorComponent" />
@@ -2949,10 +2949,10 @@
       <property role="TrG5h" value="LaunchQuery" />
       <node concept="2tJIrI" id="7WKNeR8SQxh" role="jymVt" />
       <node concept="3clFbW" id="7WKNeR8SQxi" role="jymVt">
-        <node concept="37vLTG" id="7WKNeR9ahrT" role="3clF46">
-          <property role="TrG5h" value="queryKind" />
-          <node concept="3uibUv" id="2Mi2iz0Onwr" role="1tU5fm">
-            <ref role="3uigEE" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        <node concept="37vLTG" id="5EDW3XEpavu" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="5EDW3XEpaP1" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="37vLTG" id="7WKNeR8SQxl" role="3clF46">
@@ -2993,11 +2993,11 @@
               <node concept="2OqwBi" id="7WKNeR9fnha" role="37vLTJ">
                 <node concept="Xjq3P" id="7WKNeR9fnxk" role="2Oq$k0" />
                 <node concept="2OwXpG" id="7WKNeR9fnhd" role="2OqNvi">
-                  <ref role="2Oxat5" node="7WKNeR9fm7b" resolve="queryKind" />
+                  <ref role="2Oxat5" node="7WKNeR9fm7b" resolve="query" />
                 </node>
               </node>
-              <node concept="37vLTw" id="7WKNeR9fm7l" role="37vLTx">
-                <ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryKind" />
+              <node concept="37vLTw" id="5EDW3XEpbSj" role="37vLTx">
+                <ref role="3cqZAo" node="5EDW3XEpavu" resolve="query" />
               </node>
             </node>
           </node>
@@ -3090,27 +3090,6 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="5fMWD6IsEOy" role="3cqZAp">
-            <node concept="3cpWsn" id="5fMWD6IsEOz" role="3cpWs9">
-              <property role="TrG5h" value="typeCollector" />
-              <node concept="3uibUv" id="5fMWD6IsGyo" role="1tU5fm">
-                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
-                <node concept="2sp9CU" id="5fMWD6IsHoM" role="11_B2D" />
-                <node concept="3Tqbb2" id="5fMWD6IsHQP" role="11_B2D" />
-              </node>
-              <node concept="1bVj0M" id="5fMWD6IsEO$" role="33vP2m">
-                <node concept="37vLTG" id="5fMWD6IsEO_" role="1bW2Oz">
-                  <property role="TrG5h" value="loc" />
-                  <node concept="2sp9CU" id="5fMWD6IsEOA" role="1tU5fm" />
-                </node>
-                <node concept="37vLTG" id="5fMWD6IsEOB" role="1bW2Oz">
-                  <property role="TrG5h" value="type" />
-                  <node concept="3Tqbb2" id="5fMWD6IsEOC" role="1tU5fm" />
-                </node>
-                <node concept="3clFbS" id="5fMWD6IsEOD" role="1bW5cS" />
-              </node>
-            </node>
-          </node>
           <node concept="3clFbH" id="6nFpYluogsH" role="3cqZAp" />
           <node concept="3cpWs8" id="6nFpYluoeMU" role="3cqZAp">
             <node concept="3cpWsn" id="6nFpYluoeMV" role="3cpWs9">
@@ -3163,7 +3142,7 @@
               <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                    <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
                     <node concept="37vLTw" id="6nFpYluoiGj" role="37wK5m">
                       <ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
                     </node>
@@ -3181,11 +3160,8 @@
                         <ref role="HV5vE" to="ksgm:7DvO2M9Uago" resolve="RulesListTable" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
-                      <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryKind" />
-                    </node>
-                    <node concept="37vLTw" id="5fMWD6IsEOE" role="37wK5m">
-                      <ref role="3cqZAo" node="5fMWD6IsEOz" resolve="typeCollector" />
+                    <node concept="37vLTw" id="5EDW3XEprPs" role="37wK5m">
+                      <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="query" />
                     </node>
                   </node>
                 </node>
@@ -3430,10 +3406,10 @@
         <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
       </node>
       <node concept="312cEg" id="7WKNeR9fm7b" role="jymVt">
-        <property role="TrG5h" value="queryKind" />
+        <property role="TrG5h" value="query" />
         <node concept="3Tm6S6" id="7WKNeR9fm7c" role="1B3o_S" />
-        <node concept="3uibUv" id="2Mi2iz0OnNw" role="1tU5fm">
-          <ref role="3uigEE" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        <node concept="3uibUv" id="5EDW3XEpb$m" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
     </node>
@@ -3591,9 +3567,20 @@
               <node concept="2YIFZM" id="7WKNeR8TaPY" role="2Oq$k0">
                 <ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
                 <ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
-                <node concept="10M0yZ" id="4RzhaQIJMWK" role="37wK5m">
-                  <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
-                  <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                <node concept="2YIFZM" id="5EDW3XEpy4e" role="37wK5m">
+                  <ref role="37wK5l" to="tj24:5EDW3XDYggE" resolve="check" />
+                  <ref role="1Pybhc" to="tj24:5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                  <node concept="1bVj0M" id="5EDW3XEpy8I" role="37wK5m">
+                    <node concept="3clFbS" id="5EDW3XEpy8J" role="1bW5cS" />
+                    <node concept="37vLTG" id="5EDW3XEpycy" role="1bW2Oz">
+                      <property role="TrG5h" value="p" />
+                      <node concept="2sp9CU" id="5EDW3XEpypg" role="1tU5fm" />
+                    </node>
+                    <node concept="37vLTG" id="5EDW3XEpyuG" role="1bW2Oz">
+                      <property role="TrG5h" value="n" />
+                      <node concept="3Tqbb2" id="5EDW3XEpyE1" role="1tU5fm" />
+                    </node>
+                  </node>
                 </node>
                 <node concept="2OqwBi" id="7WKNeR8TaPZ" role="37wK5m">
                   <node concept="2WthIp" id="7WKNeR8TaQ0" role="2Oq$k0" />
@@ -3705,9 +3692,20 @@
                 <node concept="2YIFZM" id="3IIf9O_okkI" role="2Oq$k0">
                   <ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
                   <ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
-                  <node concept="10M0yZ" id="4RzhaQIJMWL" role="37wK5m">
-                    <ref role="3cqZAo" to="tj24:4t7Xo7inNvw" resolve="TYPECHECK" />
-                    <ref role="1PxDUh" to="tj24:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                  <node concept="2YIFZM" id="5EDW3XEpzdD" role="37wK5m">
+                    <ref role="1Pybhc" to="tj24:5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                    <ref role="37wK5l" to="tj24:5EDW3XDYggE" resolve="check" />
+                    <node concept="1bVj0M" id="5EDW3XEpzdE" role="37wK5m">
+                      <node concept="3clFbS" id="5EDW3XEpzdF" role="1bW5cS" />
+                      <node concept="37vLTG" id="5EDW3XEpzdG" role="1bW2Oz">
+                        <property role="TrG5h" value="p" />
+                        <node concept="2sp9CU" id="5EDW3XEpzdH" role="1tU5fm" />
+                      </node>
+                      <node concept="37vLTG" id="5EDW3XEpzdI" role="1bW2Oz">
+                        <property role="TrG5h" value="n" />
+                        <node concept="3Tqbb2" id="5EDW3XEpzdJ" role="1tU5fm" />
+                      </node>
+                    </node>
                   </node>
                   <node concept="2OqwBi" id="3IIf9O_okkK" role="37wK5m">
                     <node concept="2WthIp" id="3IIf9O_okkL" role="2Oq$k0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 6dbe1431..3c3d402c 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -77,9 +77,6 @@
         <child id="1224071154656" name="expression" index="0kSFX" />
       </concept>
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
-      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
-        <child id="1219921048460" name="componentType" index="8Xvag" />
-      </concept>
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
@@ -7442,12 +7439,12 @@
                   </node>
                 </node>
               </node>
-              <node concept="10M0yZ" id="1FOQehxoN18" role="37wK5m">
-                <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
-                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-              </node>
-              <node concept="37vLTw" id="5fMWD6HQ2Ui" role="37wK5m">
-                <ref role="3cqZAo" node="5fMWD6HPS5d" resolve="typeCollector" />
+              <node concept="2YIFZM" id="5EDW3XEt_I1" role="37wK5m">
+                <ref role="37wK5l" node="5EDW3XDYggE" resolve="check" />
+                <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                <node concept="37vLTw" id="5EDW3XEt_I2" role="37wK5m">
+                  <ref role="3cqZAo" node="5fMWD6HPS5d" resolve="typeCollector" />
+                </node>
               </node>
             </node>
           </node>
@@ -7580,15 +7577,15 @@
                   </node>
                 </node>
               </node>
-              <node concept="10M0yZ" id="1FOQehxo9MY" role="37wK5m">
-                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-                <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="CONVERT" />
-              </node>
-              <node concept="37vLTw" id="7yzrjo0KwxA" role="37wK5m">
-                <ref role="3cqZAo" node="7yzrjo0K2me" resolve="source" />
-              </node>
-              <node concept="37vLTw" id="7yzrjo0Ky$y" role="37wK5m">
-                <ref role="3cqZAo" node="7yzrjo0K2mg" resolve="target" />
+              <node concept="2YIFZM" id="5EDW3XEtyNU" role="37wK5m">
+                <ref role="37wK5l" node="5EDW3XDYgsl" resolve="convert" />
+                <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                <node concept="37vLTw" id="5EDW3XEtyNV" role="37wK5m">
+                  <ref role="3cqZAo" node="7yzrjo0K2me" resolve="source" />
+                </node>
+                <node concept="37vLTw" id="5EDW3XEtyNW" role="37wK5m">
+                  <ref role="3cqZAo" node="7yzrjo0K2mg" resolve="target" />
+                </node>
               </node>
             </node>
           </node>
@@ -7680,18 +7677,18 @@
                   </node>
                 </node>
               </node>
-              <node concept="10M0yZ" id="7Bx7XgEixyk" role="37wK5m">
-                <ref role="3cqZAo" node="7Bx7XgEgdEp" resolve="COERCE" />
-                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-              </node>
-              <node concept="37vLTw" id="7yzrjo0PbTC" role="37wK5m">
-                <ref role="3cqZAo" node="7yzrjo0OFdd" resolve="source" />
-              </node>
-              <node concept="37vLTw" id="7yzrjo0Pe24" role="37wK5m">
-                <ref role="3cqZAo" node="7yzrjo0ONqZ" resolve="target" />
-              </node>
-              <node concept="37vLTw" id="4pwDyRBsoUq" role="37wK5m">
-                <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
+              <node concept="2YIFZM" id="5EDW3XEt3e$" role="37wK5m">
+                <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                <ref role="37wK5l" node="5EDW3XEtfON" resolve="coerce" />
+                <node concept="37vLTw" id="7yzrjo0PbTC" role="37wK5m">
+                  <ref role="3cqZAo" node="7yzrjo0OFdd" resolve="source" />
+                </node>
+                <node concept="37vLTw" id="7yzrjo0Pe24" role="37wK5m">
+                  <ref role="3cqZAo" node="7yzrjo0ONqZ" resolve="target" />
+                </node>
+                <node concept="37vLTw" id="4pwDyRBsoUq" role="37wK5m">
+                  <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
+                </node>
               </node>
             </node>
           </node>
@@ -8090,12 +8087,12 @@
               <node concept="37vLTw" id="7i3KM7gQiAQ" role="37wK5m">
                 <ref role="3cqZAo" node="7i3KM7gPNcC" resolve="strategy" />
               </node>
-              <node concept="10M0yZ" id="5fMWD6HI34t" role="37wK5m">
-                <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
-                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-              </node>
-              <node concept="37vLTw" id="5MNibENixnz" role="37wK5m">
-                <ref role="3cqZAo" node="5MNibENhUYB" resolve="typeCollector" />
+              <node concept="2YIFZM" id="5EDW3XEsYGH" role="37wK5m">
+                <ref role="37wK5l" node="5EDW3XDYggE" resolve="check" />
+                <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+                <node concept="37vLTw" id="5MNibENixnz" role="37wK5m">
+                  <ref role="3cqZAo" node="5MNibENhUYB" resolve="typeCollector" />
+                </node>
               </node>
             </node>
           </node>
@@ -8195,18 +8192,10 @@
           <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingService.DefaultTypecheckingStrategy" />
         </node>
       </node>
-      <node concept="37vLTG" id="1FOQehxnBeo" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="1FOQehxnBep" role="1tU5fm">
-          <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1FOQehxnWaW" role="3clF46">
-        <property role="TrG5h" value="queryParam" />
-        <node concept="8X2XB" id="1FOQehxnYCW" role="1tU5fm">
-          <node concept="3uibUv" id="1FOQehxnXEw" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEpMch" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEpWRX" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="1FOQehxnBdT" role="3clF47">
@@ -8259,11 +8248,8 @@
             <node concept="37vLTw" id="7i3KM7gLDqW" role="37wK5m">
               <ref role="3cqZAo" node="7i3KM7gLjWw" resolve="stepsFactory" />
             </node>
-            <node concept="37vLTw" id="7i3KM7guA72" role="37wK5m">
-              <ref role="3cqZAo" node="1FOQehxnBeo" resolve="queryKind" />
-            </node>
-            <node concept="37vLTw" id="7i3KM7guHAM" role="37wK5m">
-              <ref role="3cqZAo" node="1FOQehxnWaW" resolve="queryParam" />
+            <node concept="37vLTw" id="5EDW3XEsKFz" role="37wK5m">
+              <ref role="3cqZAo" node="5EDW3XEpMch" resolve="query" />
             </node>
           </node>
         </node>
@@ -8288,18 +8274,10 @@
           <node concept="3bZ5Sz" id="156bt08RivT" role="A3Ik2" />
         </node>
       </node>
-      <node concept="37vLTG" id="156bt08QxlT" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="156bt08QxlU" role="1tU5fm">
-          <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="156bt08QxlV" role="3clF46">
-        <property role="TrG5h" value="queryParam" />
-        <node concept="8X2XB" id="156bt08QxlW" role="1tU5fm">
-          <node concept="3uibUv" id="156bt08QxlX" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEqiiP" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEqiiQ" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="156bt08QxlY" role="3clF47">
@@ -8373,11 +8351,8 @@
                 <ref role="HV5vE" node="7i3KM7gIg9K" resolve="TypecheckingService.DefaultTypecheckingStrategy" />
               </node>
             </node>
-            <node concept="37vLTw" id="156bt08TbiV" role="37wK5m">
-              <ref role="3cqZAo" node="156bt08QxlT" resolve="queryKind" />
-            </node>
-            <node concept="37vLTw" id="156bt08TbiW" role="37wK5m">
-              <ref role="3cqZAo" node="156bt08QxlV" resolve="queryParam" />
+            <node concept="37vLTw" id="5EDW3XEs$xW" role="37wK5m">
+              <ref role="3cqZAo" node="5EDW3XEqiiP" resolve="query" />
             </node>
           </node>
         </node>
@@ -8396,18 +8371,10 @@
         <property role="TrG5h" value="nodes" />
         <node concept="2I9FWS" id="3KN3A4vEXnn" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="3KN3A4vEXnq" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="3KN3A4vEXnr" role="1tU5fm">
-          <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3KN3A4vEXns" role="3clF46">
-        <property role="TrG5h" value="queryParam" />
-        <node concept="8X2XB" id="3KN3A4vEXnt" role="1tU5fm">
-          <node concept="3uibUv" id="3KN3A4vEXnu" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEqzhD" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEqzhE" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="3KN3A4vEXnv" role="3clF47">
@@ -8454,11 +8421,8 @@
                 <ref role="HV5vE" node="7i3KM7gIg9K" resolve="TypecheckingService.DefaultTypecheckingStrategy" />
               </node>
             </node>
-            <node concept="37vLTw" id="7i3KM7goaSK" role="37wK5m">
-              <ref role="3cqZAo" node="3KN3A4vEXnq" resolve="queryKind" />
-            </node>
-            <node concept="37vLTw" id="7i3KM7gohYW" role="37wK5m">
-              <ref role="3cqZAo" node="3KN3A4vEXns" resolve="queryParam" />
+            <node concept="37vLTw" id="5EDW3XEsits" role="37wK5m">
+              <ref role="3cqZAo" node="5EDW3XEqzhD" resolve="query" />
             </node>
           </node>
         </node>
@@ -8494,18 +8458,10 @@
           <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingService.DefaultTypecheckingStrategy" />
         </node>
       </node>
-      <node concept="37vLTG" id="7i3KM7glTMf" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="7i3KM7glTMg" role="1tU5fm">
-          <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7i3KM7glTMh" role="3clF46">
-        <property role="TrG5h" value="queryParam" />
-        <node concept="8X2XB" id="7i3KM7glTMi" role="1tU5fm">
-          <node concept="3uibUv" id="7i3KM7glTMj" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEr1e5" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEr1e6" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3clFbS" id="7i3KM7glTMk" role="3clF47">
@@ -8595,11 +8551,8 @@
                       <node concept="37vLTw" id="7i3KM7gJXuS" role="37wK5m">
                         <ref role="3cqZAo" node="7i3KM7glTMd" resolve="nodes" />
                       </node>
-                      <node concept="37vLTw" id="7i3KM7gJZSu" role="37wK5m">
-                        <ref role="3cqZAo" node="7i3KM7glTMf" resolve="queryKind" />
-                      </node>
-                      <node concept="37vLTw" id="7i3KM7gJZSv" role="37wK5m">
-                        <ref role="3cqZAo" node="7i3KM7glTMh" resolve="queryParam" />
+                      <node concept="37vLTw" id="5EDW3XErVj7" role="37wK5m">
+                        <ref role="3cqZAo" node="5EDW3XEr1e5" resolve="query" />
                       </node>
                     </node>
                   </node>
@@ -8871,18 +8824,10 @@
           <property role="TrG5h" value="nodes" />
           <node concept="2I9FWS" id="7i3KM7gJ0u4" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="7i3KM7gJ3nG" role="3clF46">
-          <property role="TrG5h" value="queryKind" />
-          <node concept="3uibUv" id="7i3KM7gJ3nH" role="1tU5fm">
-            <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="7i3KM7gJ3nI" role="3clF46">
-          <property role="TrG5h" value="queryParam" />
-          <node concept="8X2XB" id="7i3KM7gJ3nJ" role="1tU5fm">
-            <node concept="3uibUv" id="7i3KM7gJ3nK" role="8Xvag">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
+        <node concept="37vLTG" id="5EDW3XErpy6" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="5EDW3XErpy7" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3uibUv" id="7i3KM7gISJ2" role="3clF45">
@@ -8931,7 +8876,7 @@
           <node concept="3clFbF" id="6nFpYlusgov" role="3cqZAp">
             <node concept="2ShNRf" id="6nFpYlusgor" role="3clFbG">
               <node concept="1pGfFk" id="6nFpYlushfU" role="2ShVmc">
-                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="6nFpYlushso" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                 </node>
@@ -8946,11 +8891,8 @@
                     <ref role="HV5vE" to="ksgm:7DvO2M9Uago" resolve="RulesListTable" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="6nFpYlushsx" role="37wK5m">
-                  <ref role="3cqZAo" node="7i3KM7gJ3nG" resolve="queryKind" />
-                </node>
-                <node concept="37vLTw" id="6nFpYlushsy" role="37wK5m">
-                  <ref role="3cqZAo" node="7i3KM7gJ3nI" resolve="queryParam" />
+                <node concept="37vLTw" id="5EDW3XErDAu" role="37wK5m">
+                  <ref role="3cqZAo" node="5EDW3XErpy6" resolve="query" />
                 </node>
               </node>
             </node>
@@ -9438,18 +9380,10 @@
           <property role="TrG5h" value="nodes" />
           <node concept="2I9FWS" id="6nFpYlusyqi" role="1tU5fm" />
         </node>
-        <node concept="37vLTG" id="6nFpYlusyqj" role="3clF46">
-          <property role="TrG5h" value="queryKind" />
-          <node concept="3uibUv" id="6nFpYlusyqk" role="1tU5fm">
-            <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="6nFpYlusyql" role="3clF46">
-          <property role="TrG5h" value="queryParam" />
-          <node concept="8X2XB" id="6nFpYlusyqm" role="1tU5fm">
-            <node concept="3uibUv" id="6nFpYlusyqn" role="8Xvag">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
+        <node concept="37vLTG" id="5EDW3XEtHL1" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="5EDW3XEtLaI" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="3uibUv" id="6nFpYlusyqo" role="3clF45">
@@ -9727,11 +9661,8 @@
                 <node concept="37vLTw" id="6nFpYlvfOVX" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlvfHC5" resolve="updatesRecorder" />
                 </node>
-                <node concept="37vLTw" id="6nFpYlus1Zn" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlusyqj" resolve="queryKind" />
-                </node>
-                <node concept="37vLTw" id="6nFpYlus1Zo" role="37wK5m">
-                  <ref role="3cqZAo" node="6nFpYlusyql" resolve="queryParam" />
+                <node concept="37vLTw" id="5EDW3XEtULI" role="37wK5m">
+                  <ref role="3cqZAo" node="5EDW3XEtHL1" resolve="query" />
                 </node>
               </node>
             </node>
@@ -16381,25 +16312,17 @@
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="NKt6yn7sOZ" role="1tU5fm">
-          <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6OXbTDxI9hi" role="3clF46">
-        <property role="TrG5h" value="queryParameter" />
-        <node concept="8X2XB" id="6OXbTDxIdpB" role="1tU5fm">
-          <node concept="3uibUv" id="6OXbTDxIdi7" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEtX7J" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEtXqI" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
       <node concept="3cqZAl" id="7i3KM7gApvw" role="3clF45" />
       <node concept="3Tm1VV" id="7i3KM7gApvx" role="1B3o_S" />
       <node concept="3clFbS" id="7i3KM7gApvy" role="3clF47">
         <node concept="XkiVB" id="6nFpYlursqi" role="3cqZAp">
-          <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+          <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
           <node concept="37vLTw" id="6nFpYlurv6W" role="37wK5m">
             <ref role="3cqZAo" node="6nFpYluo8Vd" resolve="session" />
           </node>
@@ -16412,11 +16335,8 @@
           <node concept="37vLTw" id="6nFpYlurvki" role="37wK5m">
             <ref role="3cqZAo" node="6nFpYluqHqg" resolve="rules" />
           </node>
-          <node concept="37vLTw" id="6nFpYlurvDv" role="37wK5m">
-            <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
-          </node>
-          <node concept="37vLTw" id="6nFpYlurvLm" role="37wK5m">
-            <ref role="3cqZAo" node="6OXbTDxI9hi" resolve="queryParameter" />
+          <node concept="37vLTw" id="5EDW3XEtZSk" role="37wK5m">
+            <ref role="3cqZAo" node="5EDW3XEtX7J" resolve="query" />
           </node>
         </node>
         <node concept="3clFbH" id="6nFpYluWRNV" role="3cqZAp" />
@@ -17097,7 +17017,7 @@
                   </node>
                 </node>
                 <node concept="3clFb_" id="5EDW3XDZFFO" role="jymVt">
-                  <property role="TrG5h" value="getTarget" />
+                  <property role="TrG5h" value="getTargetNode" />
                   <node concept="3Tqbb2" id="5EDW3XDZFFP" role="3clF45" />
                   <node concept="3Tm1VV" id="5EDW3XDZFFQ" role="1B3o_S" />
                   <node concept="3clFbS" id="5EDW3XDZFFW" role="3clF47">
@@ -17111,6 +17031,19 @@
                     <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
+                <node concept="3clFb_" id="5EDW3XEtiKH" role="jymVt">
+                  <property role="TrG5h" value="getTargetConcept" />
+                  <node concept="3bZ5Sz" id="5EDW3XEtiKI" role="3clF45" />
+                  <node concept="3Tm1VV" id="5EDW3XEtiKJ" role="1B3o_S" />
+                  <node concept="3clFbS" id="5EDW3XEtiKP" role="3clF47">
+                    <node concept="3clFbF" id="5EDW3XEtjjz" role="3cqZAp">
+                      <node concept="10Nm6u" id="5EDW3XEtjjy" role="3clFbG" />
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="5EDW3XEtiKQ" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
                 <node concept="3clFb_" id="5EDW3XDZFFY" role="jymVt">
                   <property role="TrG5h" value="getResult" />
                   <node concept="3uibUv" id="5EDW3XDZFFZ" role="3clF45">
@@ -17140,6 +17073,107 @@
       <node concept="3Tm1VV" id="5EDW3XDYNAh" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="5EDW3XDY_Kg" role="jymVt" />
+    <node concept="2YIFZL" id="5EDW3XEtfON" role="jymVt">
+      <property role="TrG5h" value="coerce" />
+      <node concept="37vLTG" id="5EDW3XEtfOO" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tqbb2" id="5EDW3XEtfOP" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5EDW3XEtfOQ" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3bZ5Sz" id="5EDW3XEtjuG" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5EDW3XEtfOS" role="3clF46">
+        <property role="TrG5h" value="result" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="5EDW3XEtfOT" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+          <node concept="3Tqbb2" id="5EDW3XEtfOU" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5EDW3XEtfOV" role="3clF47">
+        <node concept="3clFbF" id="5EDW3XEtfOW" role="3cqZAp">
+          <node concept="2ShNRf" id="5EDW3XEtfOX" role="3clFbG">
+            <node concept="YeOm9" id="5EDW3XEtfOY" role="2ShVmc">
+              <node concept="1Y3b0j" id="5EDW3XEtfOZ" role="YeSDq">
+                <property role="2bfB8j" value="true" />
+                <ref role="37wK5l" node="5EDW3XDZBFn" resolve="TypecheckingQueries.AbstractCoerceQuery" />
+                <ref role="1Y3XeK" node="5EDW3XDZBFm" resolve="TypecheckingQueries.AbstractCoerceQuery" />
+                <node concept="3Tm1VV" id="5EDW3XEtfP0" role="1B3o_S" />
+                <node concept="3clFb_" id="5EDW3XEtfP1" role="jymVt">
+                  <property role="TrG5h" value="getSource" />
+                  <node concept="3Tqbb2" id="5EDW3XEtfP2" role="3clF45" />
+                  <node concept="3Tm1VV" id="5EDW3XEtfP3" role="1B3o_S" />
+                  <node concept="3clFbS" id="5EDW3XEtfP4" role="3clF47">
+                    <node concept="3clFbF" id="5EDW3XEtfP5" role="3cqZAp">
+                      <node concept="37vLTw" id="5EDW3XEtfP6" role="3clFbG">
+                        <ref role="3cqZAo" node="5EDW3XEtfOO" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="5EDW3XEtfP7" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+                <node concept="3clFb_" id="5EDW3XEtfP8" role="jymVt">
+                  <property role="TrG5h" value="getTargetNode" />
+                  <node concept="3Tqbb2" id="5EDW3XEtfP9" role="3clF45" />
+                  <node concept="3Tm1VV" id="5EDW3XEtfPa" role="1B3o_S" />
+                  <node concept="3clFbS" id="5EDW3XEtfPb" role="3clF47">
+                    <node concept="3clFbF" id="5EDW3XEtkQn" role="3cqZAp">
+                      <node concept="10Nm6u" id="5EDW3XEtkQm" role="3clFbG" />
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="5EDW3XEtfPe" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+                <node concept="3clFb_" id="5EDW3XEtk3V" role="jymVt">
+                  <property role="TrG5h" value="getTargetConcept" />
+                  <node concept="3bZ5Sz" id="5EDW3XEtk3W" role="3clF45" />
+                  <node concept="3Tm1VV" id="5EDW3XEtk3X" role="1B3o_S" />
+                  <node concept="3clFbS" id="5EDW3XEtk43" role="3clF47">
+                    <node concept="3clFbF" id="5EDW3XEtfPc" role="3cqZAp">
+                      <node concept="37vLTw" id="5EDW3XEtfPd" role="3clFbG">
+                        <ref role="3cqZAo" node="5EDW3XEtfOQ" resolve="target" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="5EDW3XEtk44" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+                <node concept="3clFb_" id="5EDW3XEtfPf" role="jymVt">
+                  <property role="TrG5h" value="getResult" />
+                  <node concept="3uibUv" id="5EDW3XEtfPg" role="3clF45">
+                    <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+                    <node concept="3Tqbb2" id="5EDW3XEtfPh" role="11_B2D" />
+                  </node>
+                  <node concept="3Tm1VV" id="5EDW3XEtfPi" role="1B3o_S" />
+                  <node concept="3clFbS" id="5EDW3XEtfPj" role="3clF47">
+                    <node concept="3clFbF" id="5EDW3XEtfPk" role="3cqZAp">
+                      <node concept="37vLTw" id="5EDW3XEtfPl" role="3clFbG">
+                        <ref role="3cqZAo" node="5EDW3XEtfOS" resolve="result" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="5EDW3XEtfPm" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="5EDW3XEtfPn" role="3clF45">
+        <ref role="3uigEE" node="5EDW3XDYNTS" resolve="CoerceQuery" />
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XEtfPo" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="5EDW3XEtfOM" role="jymVt" />
     <node concept="312cEu" id="5EDW3XDZzEV" role="jymVt">
       <property role="TrG5h" value="AbstractTypecheckingQuery" />
       <property role="1sVAO0" value="true" />
@@ -17237,6 +17271,29 @@
       <node concept="3uibUv" id="5EDW3XDZBoE" role="EKbjA">
         <ref role="3uigEE" node="5EDW3XDYNPr" resolve="CheckQuery" />
       </node>
+      <node concept="2tJIrI" id="5EDW3XE$sRo" role="jymVt" />
+      <node concept="3clFb_" id="5EDW3XE$sRf" role="jymVt">
+        <property role="TrG5h" value="type" />
+        <node concept="3uibUv" id="5EDW3XE$sRg" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qUE_q" id="5EDW3XE$sRh" role="11_B2D">
+            <node concept="3uibUv" id="5EDW3XE$sRi" role="3qUE_r">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5EDW3XE$sRj" role="1B3o_S" />
+        <node concept="3clFbS" id="5EDW3XE$sRk" role="3clF47">
+          <node concept="3clFbF" id="5EDW3XE$sRl" role="3cqZAp">
+            <node concept="3VsKOn" id="5EDW3XE$sRm" role="3clFbG">
+              <ref role="3VsUkX" node="5EDW3XDYNPr" resolve="CheckQuery" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5EDW3XE$sRn" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XDYgqZ" role="jymVt" />
     <node concept="312cEu" id="5EDW3XDZBxS" role="jymVt">
@@ -17261,6 +17318,29 @@
       <node concept="3uibUv" id="5EDW3XDZEet" role="EKbjA">
         <ref role="3uigEE" node="5EDW3XDYNS7" resolve="ConvertQuery" />
       </node>
+      <node concept="2tJIrI" id="5EDW3XE$vkY" role="jymVt" />
+      <node concept="3clFb_" id="5EDW3XE$vkP" role="jymVt">
+        <property role="TrG5h" value="type" />
+        <node concept="3uibUv" id="5EDW3XE$vkQ" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qUE_q" id="5EDW3XE$vkR" role="11_B2D">
+            <node concept="3uibUv" id="5EDW3XE$vkS" role="3qUE_r">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5EDW3XE$vkT" role="1B3o_S" />
+        <node concept="3clFbS" id="5EDW3XE$vkU" role="3clF47">
+          <node concept="3clFbF" id="5EDW3XE$vkV" role="3cqZAp">
+            <node concept="3VsKOn" id="5EDW3XE$vkW" role="3clFbG">
+              <ref role="3VsUkX" node="5EDW3XDYNS7" resolve="ConvertQuery" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5EDW3XE$vkX" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XDZBxR" role="jymVt" />
     <node concept="312cEu" id="5EDW3XDZBFm" role="jymVt">
@@ -17278,6 +17358,29 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="5EDW3XE$pfO" role="jymVt" />
+      <node concept="3clFb_" id="5EDW3XE$q0U" role="jymVt">
+        <property role="TrG5h" value="type" />
+        <node concept="3uibUv" id="5EDW3XE$q0V" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qUE_q" id="5EDW3XE$q0W" role="11_B2D">
+            <node concept="3uibUv" id="5EDW3XE$q0X" role="3qUE_r">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5EDW3XE$q0Y" role="1B3o_S" />
+        <node concept="3clFbS" id="5EDW3XE$q10" role="3clF47">
+          <node concept="3clFbF" id="5EDW3XE$qHx" role="3cqZAp">
+            <node concept="3VsKOn" id="5EDW3XE$qL6" role="3clFbG">
+              <ref role="3VsUkX" node="5EDW3XDYNTS" resolve="CoerceQuery" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5EDW3XE$q11" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
       <node concept="3Tm1VV" id="5EDW3XDZBFt" role="1B3o_S" />
       <node concept="3uibUv" id="5EDW3XDZBFu" role="1zkMxy">
         <ref role="3uigEE" node="5EDW3XDZzEV" resolve="TypecheckingQueries.AbstractTypecheckingQuery" />
@@ -17348,11 +17451,18 @@
     </node>
     <node concept="2tJIrI" id="5EDW3XDYO37" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XDYO27" role="jymVt">
-      <property role="TrG5h" value="getTarget" />
+      <property role="TrG5h" value="getTargetNode" />
       <node concept="3Tqbb2" id="5EDW3XDYO28" role="3clF45" />
       <node concept="3Tm1VV" id="5EDW3XDYO29" role="1B3o_S" />
       <node concept="3clFbS" id="5EDW3XDYO2a" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="5EDW3XEthCN" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XEtgZU" role="jymVt">
+      <property role="TrG5h" value="getTargetConcept" />
+      <node concept="3bZ5Sz" id="5EDW3XEtikD" role="3clF45" />
+      <node concept="3Tm1VV" id="5EDW3XEtgZW" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XEtgZX" role="3clF47" />
+    </node>
     <node concept="2tJIrI" id="5EDW3XDYO4n" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XDYO56" role="jymVt">
       <property role="TrG5h" value="getResult" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 5ed988d0..5f02a424 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -538,145 +538,124 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7kTeLbPt4n9" role="jymVt" />
-    <node concept="3clFbW" id="7WKNeR9fh8j" role="jymVt">
-      <node concept="3cqZAl" id="7WKNeR9fh8k" role="3clF45" />
-      <node concept="3Tm1VV" id="7WKNeR9fh8l" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR9fh8m" role="3clF47">
-        <node concept="3clFbJ" id="2Mi2iz0WFjM" role="3cqZAp">
-          <node concept="3clFbS" id="2Mi2iz0WFjO" role="3clFbx">
-            <node concept="YS8fn" id="2Mi2iz0WG2w" role="3cqZAp">
-              <node concept="2ShNRf" id="2Mi2iz0WG75" role="YScLw">
-                <node concept="1pGfFk" id="2Mi2iz0WINh" role="2ShVmc">
+    <node concept="2tJIrI" id="7WKNeR9fh8i" role="jymVt" />
+    <node concept="3clFbW" id="5EDW3XEoy55" role="jymVt">
+      <node concept="3cqZAl" id="5EDW3XEoy56" role="3clF45" />
+      <node concept="3Tm1VV" id="5EDW3XEoy57" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XEoy58" role="3clF47">
+        <node concept="3clFbJ" id="5EDW3XEoy59" role="3cqZAp">
+          <node concept="3clFbS" id="5EDW3XEoy5a" role="3clFbx">
+            <node concept="YS8fn" id="5EDW3XEoy5b" role="3cqZAp">
+              <node concept="2ShNRf" id="5EDW3XEoy5c" role="YScLw">
+                <node concept="1pGfFk" id="5EDW3XEoy5d" role="2ShVmc">
                   <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbC" id="2Mi2iz0WFSm" role="3clFbw">
-            <node concept="10Nm6u" id="2Mi2iz0WFWG" role="3uHU7w" />
-            <node concept="37vLTw" id="2Mi2iz0WFDW" role="3uHU7B">
-              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
+          <node concept="3clFbC" id="5EDW3XEoy5e" role="3clFbw">
+            <node concept="10Nm6u" id="5EDW3XEoy5f" role="3uHU7w" />
+            <node concept="37vLTw" id="5EDW3XEoy5g" role="3uHU7B">
+              <ref role="3cqZAo" node="5EDW3XEoy5X" resolve="query" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6nFpYluo9mg" role="3cqZAp">
-          <node concept="37vLTI" id="6nFpYluo9mh" role="3clFbG">
-            <node concept="2OqwBi" id="6nFpYluo9mi" role="37vLTJ">
-              <node concept="Xjq3P" id="6nFpYluo9mj" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6nFpYluo9mk" role="2OqNvi">
+        <node concept="3clFbF" id="5EDW3XEoy5h" role="3cqZAp">
+          <node concept="37vLTI" id="5EDW3XEoy5i" role="3clFbG">
+            <node concept="2OqwBi" id="5EDW3XEoy5j" role="37vLTJ">
+              <node concept="Xjq3P" id="5EDW3XEoy5k" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5EDW3XEoy5l" role="2OqNvi">
                 <ref role="2Oxat5" node="6nFpYluo50r" resolve="session" />
               </node>
             </node>
-            <node concept="37vLTw" id="6nFpYluoap5" role="37vLTx">
-              <ref role="3cqZAo" node="6nFpYluo8Vd" resolve="session" />
+            <node concept="37vLTw" id="5EDW3XEoy5m" role="37vLTx">
+              <ref role="3cqZAo" node="5EDW3XEoy5P" resolve="session" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7WKNeR9fh8t" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR9fh8u" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR9fh8v" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR9fh8w" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR9fh8x" role="2OqNvi">
+        <node concept="3clFbF" id="5EDW3XEoy5n" role="3cqZAp">
+          <node concept="37vLTI" id="5EDW3XEoy5o" role="3clFbG">
+            <node concept="2OqwBi" id="5EDW3XEoy5p" role="37vLTJ">
+              <node concept="Xjq3P" id="5EDW3XEoy5q" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5EDW3XEoy5r" role="2OqNvi">
                 <ref role="2Oxat5" node="7kTeLbPt5$3" resolve="nodes" />
               </node>
             </node>
-            <node concept="37vLTw" id="7WKNeR9fh8y" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fh8z" resolve="inputNodes" />
+            <node concept="37vLTw" id="5EDW3XEoy5s" role="37vLTx">
+              <ref role="3cqZAo" node="5EDW3XEoy5R" resolve="inputNodes" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7WKNeR9fh8n" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR9fh8o" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR9fh8p" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR9fh8q" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR9fh8r" role="2OqNvi">
+        <node concept="3clFbF" id="5EDW3XEoy5t" role="3cqZAp">
+          <node concept="37vLTI" id="5EDW3XEoy5u" role="3clFbG">
+            <node concept="2OqwBi" id="5EDW3XEoy5v" role="37vLTJ">
+              <node concept="Xjq3P" id="5EDW3XEoy5w" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5EDW3XEoy5x" role="2OqNvi">
                 <ref role="2Oxat5" node="6kREIVkLEGt" resolve="repository" />
               </node>
             </node>
-            <node concept="37vLTw" id="7WKNeR9fh8s" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fh8_" resolve="repository" />
+            <node concept="37vLTw" id="5EDW3XEoy5y" role="37vLTx">
+              <ref role="3cqZAo" node="5EDW3XEoy5T" resolve="repository" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6nFpYluqHOj" role="3cqZAp">
-          <node concept="37vLTI" id="6nFpYluqHOk" role="3clFbG">
-            <node concept="2OqwBi" id="6nFpYluqHOl" role="37vLTJ">
-              <node concept="Xjq3P" id="6nFpYluqHOm" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6nFpYluqHOn" role="2OqNvi">
+        <node concept="3clFbF" id="5EDW3XEoy5z" role="3cqZAp">
+          <node concept="37vLTI" id="5EDW3XEoy5$" role="3clFbG">
+            <node concept="2OqwBi" id="5EDW3XEoy5_" role="37vLTJ">
+              <node concept="Xjq3P" id="5EDW3XEoy5A" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5EDW3XEoy5B" role="2OqNvi">
                 <ref role="2Oxat5" node="6nFpYluqFen" resolve="rules" />
               </node>
             </node>
-            <node concept="37vLTw" id="6nFpYluqHOo" role="37vLTx">
-              <ref role="3cqZAo" node="6nFpYluqHqg" resolve="rules" />
+            <node concept="37vLTw" id="5EDW3XEoy5C" role="37vLTx">
+              <ref role="3cqZAo" node="5EDW3XEoy5V" resolve="rules" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryKind" />
+        <node concept="3clFbF" id="5EDW3XEoCwo" role="3cqZAp">
+          <node concept="37vLTI" id="5EDW3XEoDwq" role="3clFbG">
+            <node concept="37vLTw" id="5EDW3XEoDEv" role="37vLTx">
+              <ref role="3cqZAo" node="5EDW3XEoy5X" resolve="query" />
+            </node>
+            <node concept="2OqwBi" id="5EDW3XEoCZj" role="37vLTJ">
+              <node concept="Xjq3P" id="5EDW3XEoCwm" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5EDW3XEoDiT" role="2OqNvi">
+                <ref role="2Oxat5" node="5EDW3XEoAmV" resolve="query" />
               </node>
             </node>
-            <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6OXbTDxIg05" role="3cqZAp">
-          <node concept="37vLTI" id="6OXbTDxIg07" role="3clFbG">
-            <node concept="2OqwBi" id="6OXbTDxIh3L" role="37vLTJ">
-              <node concept="Xjq3P" id="6OXbTDxIhcu" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6OXbTDxIh3O" role="2OqNvi">
-                <ref role="2Oxat5" node="6OXbTDxIg00" resolve="queryParameter" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="6OXbTDxIg0b" role="37vLTx">
-              <ref role="3cqZAo" node="6OXbTDxI9hi" resolve="queryParameter" />
-            </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="6nFpYluo8Vd" role="3clF46">
+      <node concept="37vLTG" id="5EDW3XEoy5P" role="3clF46">
         <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="6nFpYluo8Ve" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XEoy5Q" role="1tU5fm">
           <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
         </node>
       </node>
-      <node concept="37vLTG" id="7WKNeR9fh8z" role="3clF46">
+      <node concept="37vLTG" id="5EDW3XEoy5R" role="3clF46">
         <property role="TrG5h" value="inputNodes" />
-        <node concept="2I9FWS" id="7WKNeR9fh8$" role="1tU5fm" />
+        <node concept="2I9FWS" id="5EDW3XEoy5S" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="7WKNeR9fh8_" role="3clF46">
+      <node concept="37vLTG" id="5EDW3XEoy5T" role="3clF46">
         <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7WKNeR9fh8A" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XEoy5U" role="1tU5fm">
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="37vLTG" id="6nFpYluqHqg" role="3clF46">
+      <node concept="37vLTG" id="5EDW3XEoy5V" role="3clF46">
         <property role="TrG5h" value="rules" />
-        <node concept="3uibUv" id="6nFpYluqHIQ" role="1tU5fm">
+        <node concept="3uibUv" id="5EDW3XEoy5W" role="1tU5fm">
           <ref role="3uigEE" to="ksgm:7DvO2M9Uago" resolve="RulesListTable" />
         </node>
       </node>
-      <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
-        <property role="TrG5h" value="queryKind" />
-        <node concept="3uibUv" id="NKt6yn7sOZ" role="1tU5fm">
-          <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="6OXbTDxI9hi" role="3clF46">
-        <property role="TrG5h" value="queryParameter" />
-        <node concept="8X2XB" id="6OXbTDxIdpB" role="1tU5fm">
-          <node concept="3uibUv" id="6OXbTDxIdi7" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+      <node concept="37vLTG" id="5EDW3XEoy5X" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="5EDW3XEoAaz" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7WKNeR9fh8i" role="jymVt" />
+    <node concept="2tJIrI" id="5EDW3XEoy54" role="jymVt" />
     <node concept="3clFb_" id="Hg6Enc3ZJW" role="jymVt">
       <property role="TrG5h" value="schedule" />
       <property role="1EzhhJ" value="false" />
@@ -942,8 +921,8 @@
                                 <node concept="37vLTw" id="7kTeLbPtKEF" role="37wK5m">
                                   <ref role="3cqZAo" node="7kTeLbPt5$3" resolve="nodes" />
                                 </node>
-                                <node concept="37vLTw" id="6OXbTDxOms3" role="37wK5m">
-                                  <ref role="3cqZAo" node="6OXbTDxIg00" resolve="queryParameter" />
+                                <node concept="37vLTw" id="5EDW3XEu5SF" role="37wK5m">
+                                  <ref role="3cqZAo" node="5EDW3XEoAmV" resolve="query" />
                                 </node>
                               </node>
                               <node concept="37vLTw" id="3bpBM3Qd8fq" role="2Oq$k0">
@@ -1184,8 +1163,8 @@
             <node concept="10Nm6u" id="6nFpYluVUva" role="3K4GZi" />
             <node concept="3y3z36" id="6nFpYluVUvb" role="3K4Cdx">
               <node concept="10Nm6u" id="6nFpYluVUvc" role="3uHU7w" />
-              <node concept="37vLTw" id="6nFpYluVUvd" role="3uHU7B">
-                <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryKind" />
+              <node concept="37vLTw" id="5EDW3XE$28T" role="3uHU7B">
+                <ref role="3cqZAo" node="5EDW3XEoAmV" resolve="query" />
               </node>
             </node>
             <node concept="1eOMI4" id="6nFpYluVUve" role="3K4E3e">
@@ -1199,9 +1178,14 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6nFpYluVUvj" role="2OqNvi">
-                  <ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
-                  <node concept="37vLTw" id="6nFpYluVUvk" role="37wK5m">
-                    <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryKind" />
+                  <ref role="37wK5l" to="hano:5EDW3XEzBxY" resolve="byQueryType" />
+                  <node concept="2OqwBi" id="5EDW3XE$692" role="37wK5m">
+                    <node concept="37vLTw" id="5EDW3XE$5cc" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5EDW3XEoAmV" resolve="query" />
+                    </node>
+                    <node concept="liA8E" id="5EDW3XE$ye$" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:5EDW3XE$mhS" resolve="type" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -1259,21 +1243,11 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6nFpYlurNYs" role="jymVt" />
-    <node concept="312cEg" id="7WKNeR9fj4f" role="jymVt">
-      <property role="TrG5h" value="queryKind" />
-      <node concept="3Tm6S6" id="7WKNeR9fj4g" role="1B3o_S" />
-      <node concept="3uibUv" id="NKt6yn7sRn" role="1tU5fm">
-        <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
-      </node>
-    </node>
-    <node concept="312cEg" id="6OXbTDxIg00" role="jymVt">
-      <property role="TrG5h" value="queryParameter" />
-      <node concept="3Tm6S6" id="6OXbTDxIg01" role="1B3o_S" />
-      <node concept="10Q1$e" id="6OXbTDxIhw6" role="1tU5fm">
-        <node concept="3uibUv" id="6OXbTDxIg04" role="10Q1$1">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
+    <node concept="312cEg" id="5EDW3XEoAmV" role="jymVt">
+      <property role="TrG5h" value="query" />
+      <node concept="3Tm6S6" id="5EDW3XEoAmW" role="1B3o_S" />
+      <node concept="3uibUv" id="5EDW3XEoBY1" role="1tU5fm">
+        <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
       </node>
     </node>
     <node concept="16euLQ" id="3KN3A4vA$Xq" role="16eVyc">
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index ec7e5afa..c8ed7e17 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -35,6 +35,7 @@
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
     <import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -339,9 +340,9 @@
               <node concept="2ShNRf" id="78H58oeuBhR" role="2Oq$k0">
                 <node concept="1pGfFk" id="78H58oeuBZk" role="2ShVmc">
                   <ref role="37wK5l" node="7WKNeR8SQxi" resolve="ControlflowActions.LaunchQuery" />
-                  <node concept="10M0yZ" id="78H58oeuC3J" role="37wK5m">
-                    <ref role="3cqZAo" to="fjx4:4t7Xo7inNvw" resolve="CHECK" />
-                    <ref role="1PxDUh" to="fjx4:4t7Xo7inNgi" resolve="ControlflowQueryKind" />
+                  <node concept="2YIFZM" id="5EDW3XEoR$1" role="37wK5m">
+                    <ref role="37wK5l" to="fjx4:5EDW3XE0cmi" resolve="check" />
+                    <ref role="1Pybhc" to="fjx4:5EDW3XE0ciC" resolve="ControlflowQueries" />
                   </node>
                   <node concept="2OqwBi" id="78H58oeuCf$" role="37wK5m">
                     <node concept="2WthIp" id="78H58oeuCfB" role="2Oq$k0" />
@@ -786,10 +787,10 @@
       <property role="TrG5h" value="LaunchQuery" />
       <node concept="2tJIrI" id="7WKNeR8SQxh" role="jymVt" />
       <node concept="3clFbW" id="7WKNeR8SQxi" role="jymVt">
-        <node concept="37vLTG" id="7WKNeR9ahrT" role="3clF46">
-          <property role="TrG5h" value="queryKind" />
-          <node concept="3uibUv" id="78H58oetGzy" role="1tU5fm">
-            <ref role="3uigEE" to="fjx4:4t7Xo7inNgi" resolve="ControlflowQueryKind" />
+        <node concept="37vLTG" id="5EDW3XEoPeM" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="5EDW3XEoPt7" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
           </node>
         </node>
         <node concept="37vLTG" id="7WKNeR8SQxl" role="3clF46">
@@ -830,11 +831,11 @@
               <node concept="2OqwBi" id="7WKNeR9fnha" role="37vLTJ">
                 <node concept="Xjq3P" id="7WKNeR9fnxk" role="2Oq$k0" />
                 <node concept="2OwXpG" id="7WKNeR9fnhd" role="2OqNvi">
-                  <ref role="2Oxat5" node="7WKNeR9fm7b" resolve="queryKind" />
+                  <ref role="2Oxat5" node="7WKNeR9fm7b" resolve="query" />
                 </node>
               </node>
-              <node concept="37vLTw" id="7WKNeR9fm7l" role="37vLTx">
-                <ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryKind" />
+              <node concept="37vLTw" id="5EDW3XEoR6C" role="37vLTx">
+                <ref role="3cqZAo" node="5EDW3XEoPeM" resolve="query" />
               </node>
             </node>
           </node>
@@ -1001,7 +1002,7 @@
               <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                    <ref role="37wK5l" to="1yqb:5EDW3XEoy55" resolve="ApplyTemplatesStep" />
                     <node concept="37vLTw" id="6nFpYluoru8" role="37wK5m">
                       <ref role="3cqZAo" node="6nFpYlun4Ef" resolve="session" />
                     </node>
@@ -1020,7 +1021,7 @@
                       </node>
                     </node>
                     <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
-                      <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryKind" />
+                      <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="query" />
                     </node>
                   </node>
                 </node>
@@ -1235,10 +1236,10 @@
         <ref role="3uigEE" node="7WKNeR8RiDf" resolve="ControlflowActions.AbstractAction" />
       </node>
       <node concept="312cEg" id="7WKNeR9fm7b" role="jymVt">
-        <property role="TrG5h" value="queryKind" />
+        <property role="TrG5h" value="query" />
         <node concept="3Tm6S6" id="7WKNeR9fm7c" role="1B3o_S" />
-        <node concept="3uibUv" id="78H58oetHu2" role="1tU5fm">
-          <ref role="3uigEE" to="fjx4:4t7Xo7inNgi" resolve="ControlflowQueryKind" />
+        <node concept="3uibUv" id="5EDW3XEoQuU" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
         </node>
       </node>
     </node>
@@ -1903,9 +1904,9 @@
                 <node concept="2ShNRf" id="6Yb9hAqUWJw" role="2Oq$k0">
                   <node concept="1pGfFk" id="6Yb9hAqUWJx" role="2ShVmc">
                     <ref role="37wK5l" node="7WKNeR8SQxi" resolve="ControlflowActions.LaunchQuery" />
-                    <node concept="10M0yZ" id="6Yb9hAqUWJy" role="37wK5m">
-                      <ref role="3cqZAo" to="fjx4:4t7Xo7inNvw" resolve="CHECK" />
-                      <ref role="1PxDUh" to="fjx4:4t7Xo7inNgi" resolve="ControlflowQueryKind" />
+                    <node concept="2YIFZM" id="5EDW3XEoS63" role="37wK5m">
+                      <ref role="37wK5l" to="fjx4:5EDW3XE0cmi" resolve="check" />
+                      <ref role="1Pybhc" to="fjx4:5EDW3XE0ciC" resolve="ControlflowQueries" />
                     </node>
                     <node concept="2OqwBi" id="6Yb9hAqUWJz" role="37wK5m">
                       <node concept="2WthIp" id="6Yb9hAqUWJ$" role="2Oq$k0" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 0d53450e..a15fa3b0 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -115,6 +115,9 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
+        <child id="1171903916107" name="bound" index="3qUE_r" />
+      </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -751,6 +754,29 @@
       <node concept="3uibUv" id="5EDW3XE0dCx" role="EKbjA">
         <ref role="3uigEE" node="5EDW3XDZxpN" resolve="CheckQuery" />
       </node>
+      <node concept="2tJIrI" id="5EDW3XE$nUv" role="jymVt" />
+      <node concept="3clFb_" id="5EDW3XE$o1z" role="jymVt">
+        <property role="TrG5h" value="type" />
+        <node concept="3uibUv" id="5EDW3XE$o1$" role="3clF45">
+          <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          <node concept="3qUE_q" id="5EDW3XE$o1_" role="11_B2D">
+            <node concept="3uibUv" id="5EDW3XE$o1A" role="3qUE_r">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="5EDW3XE$o1B" role="1B3o_S" />
+        <node concept="3clFbS" id="5EDW3XE$o1D" role="3clF47">
+          <node concept="3clFbF" id="5EDW3XE$ogd" role="3cqZAp">
+            <node concept="3VsKOn" id="5EDW3XE$oh9" role="3clFbG">
+              <ref role="3VsUkX" node="5EDW3XDZxpN" resolve="CheckQuery" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="5EDW3XE$o1E" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5EDW3XE0d4j" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XE0ciD" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index f9d78dc2..df3d9652 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -971,12 +971,36 @@
         </node>
         <node concept="3Tm1VV" id="5itBwM86qEQ" role="1B3o_S" />
         <node concept="3clFbS" id="5itBwM86qER" role="3clF47" />
+        <node concept="2AHcQZ" id="5EDW3XEGhLi" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5EDW3XEg_4T" role="jymVt" />
+      <node concept="3clFb_" id="5EDW3XEg_7p" role="jymVt">
+        <property role="TrG5h" value="withQuery" />
+        <node concept="3clFbS" id="5EDW3XEg_7s" role="3clF47" />
+        <node concept="3Tm1VV" id="5EDW3XEg_7t" role="1B3o_S" />
+        <node concept="3uibUv" id="5EDW3XEg_6i" role="3clF45">
+          <ref role="3uigEE" node="6R6MIbU8M46" resolve="QueryTemplate.Token" />
+        </node>
+        <node concept="37vLTG" id="5EDW3XEg_9Z" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="16syzq" id="5EDW3XEgDpv" role="1tU5fm">
+            <ref role="16sUi3" node="5EDW3XEgDlQ" resolve="Q" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="6R6MIbUs$7p" role="jymVt" />
       <node concept="3Tm1VV" id="6R6MIbU8M4h" role="1B3o_S" />
       <node concept="3uibUv" id="6R6MIbU8M4i" role="3HQHJm">
         <ref role="3uigEE" node="mJ_D14woL$" resolve="Template.Token" />
       </node>
+      <node concept="16euLQ" id="5EDW3XEgDlQ" role="16eVyc">
+        <property role="TrG5h" value="Q" />
+        <node concept="3uibUv" id="5EDW3XEgDnQ" role="3ztrMU">
+          <ref role="3uigEE" node="5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6R6MIbUcYx4" role="jymVt" />
     <node concept="3HP615" id="7P_FdVPsDC0" role="jymVt">
@@ -1033,7 +1057,7 @@
     </node>
     <node concept="2tJIrI" id="6OXbTD$iO0D" role="jymVt" />
     <node concept="3clFb_" id="5EDW3XE0DF4" role="jymVt">
-      <property role="TrG5h" value="queryClass" />
+      <property role="TrG5h" value="queryType" />
       <node concept="3clFbS" id="5EDW3XE0DF7" role="3clF47" />
       <node concept="3Tm1VV" id="5EDW3XE0DF8" role="1B3o_S" />
       <node concept="3uibUv" id="5EDW3XE0Dl6" role="3clF45">
@@ -7441,6 +7465,20 @@
       <node concept="3Tm1VV" id="5EDW3XDYeXR" role="1B3o_S" />
       <node concept="3clFbS" id="5EDW3XDYeXS" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="5EDW3XE$kPJ" role="jymVt" />
+    <node concept="3clFb_" id="5EDW3XE$mhS" role="jymVt">
+      <property role="TrG5h" value="type" />
+      <node concept="3uibUv" id="5EDW3XE$n7X" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+        <node concept="3qUE_q" id="5EDW3XE$n$8" role="11_B2D">
+          <node concept="3uibUv" id="5EDW3XE$n$V" role="3qUE_r">
+            <ref role="3uigEE" node="5EDW3XDYeWv" resolve="Query" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5EDW3XE$mhV" role="1B3o_S" />
+      <node concept="3clFbS" id="5EDW3XE$mhW" role="3clF47" />
+    </node>
     <node concept="2tJIrI" id="5EDW3XDYeXm" role="jymVt" />
     <node concept="3Tm1VV" id="5EDW3XDYeWw" role="1B3o_S" />
   </node>