diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index 36d4add4..81cc4cef 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -630,7 +630,7 @@
                       <node concept="2OqwBi" id="7LI_gNMXlnQ" role="3jicU7">
                         <node concept="2OqwBi" id="7LI_gNMXl0Q" role="2Oq$k0">
                           <node concept="3A2sRY" id="7LI_gNMXkT0" role="2Oq$k0">
-                            <ref role="3A2yKK" node="7LI_gNMXkRz" resolve="qp" />
+                            <ref role="3A2yKK" node="7LI_gNMXkRz" />
                           </node>
                           <node concept="2qgKlT" id="7LI_gNMXl9x" role="2OqNvi">
                             <ref role="37wK5l" to="x5bw:5EDW3XEbK7c" resolve="getQueryTemplate" />
@@ -1248,30 +1248,35 @@
                           <node concept="3Aqczg" id="7LI_gNMXV79" role="3cqZAp">
                             <node concept="3jbYBd" id="7LI_gNMXV76" role="3Aqpz8">
                               <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
-                              <node concept="1y4W85" id="7LI_gNMXXLN" role="3jbY8P">
-                                <node concept="37vLTw" id="7LI_gNMXXSH" role="1y58nS">
-                                  <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
-                                </node>
-                                <node concept="2OqwBi" id="7LI_gNMXVET" role="1y566C">
-                                  <node concept="2OqwBi" id="7LI_gNMXVhK" role="2Oq$k0">
-                                    <node concept="3A2sRY" id="7LI_gNMXV88" role="2Oq$k0">
-                                      <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
-                                    </node>
-                                    <node concept="3TrEf2" id="7LI_gNMXVxZ" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
-                                    </node>
-                                  </node>
-                                  <node concept="3Tsc0h" id="7LI_gNMXVWv" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
-                                  </node>
-                                </node>
-                              </node>
                               <node concept="a7P8L" id="7LI_gNMXV7p" role="3jbY8V">
                                 <ref role="a7OzE" node="7LI_gNMXV3g" resolve="DataType" />
                                 <node concept="37vLTw" id="7LI_gNMXV7N" role="3gCZO6">
                                   <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
                                 </node>
                               </node>
+                              <node concept="2OqwBi" id="3Xe1abZYB0Z" role="3jbY8P">
+                                <node concept="1y4W85" id="7LI_gNMXXLN" role="2Oq$k0">
+                                  <node concept="37vLTw" id="7LI_gNMXXSH" role="1y58nS">
+                                    <ref role="3cqZAo" node="7LI_gNMXURp" resolve="i" />
+                                  </node>
+                                  <node concept="2OqwBi" id="7LI_gNMXVET" role="1y566C">
+                                    <node concept="2OqwBi" id="7LI_gNMXVhK" role="2Oq$k0">
+                                      <node concept="3A2sRY" id="7LI_gNMXV88" role="2Oq$k0">
+                                        <ref role="3A2yKK" node="7LI_gNMXJHc" resolve="uc" />
+                                      </node>
+                                      <node concept="3TrEf2" id="7LI_gNMXVxZ" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
+                                      </node>
+                                    </node>
+                                    <node concept="3Tsc0h" id="7LI_gNMXVWv" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:1CgWc1TyPxy" resolve="parameters" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrEf2" id="3Xe1abZYBqD" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5f6wxQ38Bap" resolve="dataType" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                           <node concept="3Aqczg" id="7LI_gNMXXZg" role="3cqZAp">