diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index 2b1467e2..108a9228 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -102,6 +102,12 @@
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="625126330682908270" name="jetbrains.mps.lang.editor.structure.CellModel_ReferencePresentation" flags="sg" stub="730538219795961225" index="3SHvHV" />
+      <concept id="4307758654696938365" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_RefPresentation" flags="ig" index="1WAQ3h" />
+      <concept id="4307758654696952957" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ReferencedNode" flags="ng" index="1WAUZh" />
+      <concept id="8428109087107030357" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_ReferenceScope" flags="ng" index="3XHNnq">
+        <reference id="8428109087107339113" name="reference" index="3XGfJA" />
+        <child id="4307758654694904293" name="matchingTextFunction" index="1WZ6D9" />
+      </concept>
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -126,6 +132,11 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -146,6 +157,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -486,6 +500,13 @@
     <property role="3GE5qa" value="typeTerm" />
     <ref role="1XX52x" to="zfi7:1vAI4X$MkW8" resolve="FeatureReferenceExpression" />
     <node concept="3EZMnI" id="1vAI4X$MmzN" role="2wV5jI">
+      <node concept="3F0ifn" id="KkWtiMpyVa" role="3EZMnx">
+        <property role="3F0ifm" value="$" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <node concept="11LMrY" id="KkWtiMpzkZ" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
       <node concept="1iCGBv" id="1vAI4X$MmIy" role="3EZMnx">
         <ref role="1NtTu8" to="zfi7:1vAI4X$MlAp" resolve="feature" />
         <node concept="1sVBvm" id="1vAI4X$MmI_" role="1sWHZn">
@@ -600,5 +621,30 @@
       <node concept="l2Vlx" id="5ij6i2UE8ec" role="2iSdaV" />
     </node>
   </node>
+  <node concept="22mcaB" id="KkWtiMpvx3">
+    <property role="3GE5qa" value="typeTerm" />
+    <ref role="aqKnT" to="zfi7:1vAI4X$MkW8" resolve="FeatureReferenceExpression" />
+    <node concept="3XHNnq" id="KkWtiMpv_M" role="3ft7WO">
+      <ref role="3XGfJA" to="zfi7:1vAI4X$MlAp" />
+      <node concept="1WAQ3h" id="KkWtiMpv_R" role="1WZ6D9">
+        <node concept="3clFbS" id="KkWtiMpv_T" role="2VODD2">
+          <node concept="3clFbF" id="KkWtiMpvUz" role="3cqZAp">
+            <node concept="3cpWs3" id="KkWtiMpxa$" role="3clFbG">
+              <node concept="2OqwBi" id="KkWtiMpx$$" role="3uHU7w">
+                <node concept="1WAUZh" id="KkWtiMpxbf" role="2Oq$k0" />
+                <node concept="3TrcHB" id="KkWtiMpy1B" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="KkWtiMpvUy" role="3uHU7B">
+                <property role="Xl_RC" value="$" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22hDWj" id="KkWtiMpyIb" role="22hAXT" />
+  </node>
 </model>