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 655c774e..a4f255a1 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
@@ -381,6 +381,13 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -811,26 +818,30 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1imVejVBgja" role="3cqZAp">
-          <node concept="37vLTI" id="1imVejVBi1a" role="3clFbG">
-            <node concept="2OqwBi" id="1imVejVBiTV" role="37vLTx">
-              <node concept="37vLTw" id="1imVejVBiO2" role="2Oq$k0">
-                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
-              </node>
-              <node concept="liA8E" id="1imVejVBj59" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStore(java.util.Collection)" resolve="withStore" />
-                <node concept="2OqwBi" id="1imVejVBjmO" role="37wK5m">
-                  <node concept="37vLTw" id="1imVejVBja6" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="programProducer" />
-                  </node>
-                  <node concept="liA8E" id="1imVejVBjxN" role="2OqNvi">
-                    <ref role="37wK5l" node="1imVejVAvuv" resolve="initialStore" />
+        <node concept="1X3_iC" id="2gPa6JItLYE" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="1imVejVBgja" role="8Wnug">
+            <node concept="37vLTI" id="1imVejVBi1a" role="3clFbG">
+              <node concept="2OqwBi" id="1imVejVBiTV" role="37vLTx">
+                <node concept="37vLTw" id="1imVejVBiO2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+                </node>
+                <node concept="liA8E" id="1imVejVBj59" role="2OqNvi">
+                  <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStore(java.util.Collection)" resolve="withStore" />
+                  <node concept="2OqwBi" id="1imVejVBjmO" role="37wK5m">
+                    <node concept="37vLTw" id="1imVejVBja6" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="programProducer" />
+                    </node>
+                    <node concept="liA8E" id="1imVejVBjxN" role="2OqNvi">
+                      <ref role="37wK5l" node="1imVejVAvuv" resolve="initialStore" />
+                    </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="37vLTw" id="1imVejVBgj8" role="37vLTJ">
-              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+              <node concept="37vLTw" id="1imVejVBgj8" role="37vLTJ">
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+              </node>
             </node>
           </node>
         </node>
@@ -3771,7 +3782,7 @@
       <node concept="3Tm1VV" id="7DvO2M9pduw" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9pdux" role="3clF47">
         <node concept="1VxSAg" id="7i3KM7g75bf" role="3cqZAp">
-          <ref role="37wK5l" node="7WKNeR9bcL$" resolve="ProgramProducer" />
+          <ref role="37wK5l" node="2gPa6JI$Zi_" resolve="ProgramProducer" />
           <node concept="37vLTw" id="7i3KM7g75eT" role="37wK5m">
             <ref role="3cqZAo" node="6OXbTDxtJVO" resolve="name" />
           </node>
@@ -3795,11 +3806,6 @@
             <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
           </node>
           <node concept="10Nm6u" id="7i3KM7g75Hb" role="37wK5m" />
-          <node concept="2ShNRf" id="1imVejVAmxY" role="37wK5m">
-            <node concept="HV5vD" id="1imVejVAn7b" role="2ShVmc">
-              <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-            </node>
-          </node>
         </node>
       </node>
       <node concept="37vLTG" id="6OXbTDxtJVO" role="3clF46">
@@ -3919,8 +3925,92 @@
           <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
         </node>
       </node>
+      <node concept="2AHcQZ" id="2gPa6JI_9_k" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="3GlpCDSxTK6" role="jymVt" />
+    <node concept="3clFbW" id="2gPa6JI$Zi_" role="jymVt">
+      <node concept="37vLTG" id="2gPa6JI$ZiA" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="2gPa6JI$ZiB" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiC" role="3clF46">
+        <property role="TrG5h" value="applicationSession" />
+        <node concept="3uibUv" id="2gPa6JI$ZiD" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiE" role="3clF46">
+        <property role="TrG5h" value="ruleProcessingSession" />
+        <node concept="3uibUv" id="2gPa6JI$ZiF" role="1tU5fm">
+          <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2gPa6JI$ZiG" role="3clF46">
+        <property role="TrG5h" value="queryTemplate" />
+        <node concept="3uibUv" id="2gPa6JI$ZiH" role="1tU5fm">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2gPa6JI$ZiI" role="3clF45" />
+      <node concept="3Tm1VV" id="2gPa6JI$ZiJ" role="1B3o_S" />
+      <node concept="3clFbS" id="2gPa6JI$ZiK" role="3clF47">
+        <node concept="3clFbF" id="2gPa6JI$ZiL" role="3cqZAp">
+          <node concept="37vLTI" id="2gPa6JI$ZiM" role="3clFbG">
+            <node concept="37vLTw" id="2gPa6JI$ZiN" role="37vLTx">
+              <ref role="3cqZAo" node="2gPa6JI$ZiA" resolve="name" />
+            </node>
+            <node concept="2OqwBi" id="2gPa6JI$ZiO" role="37vLTJ">
+              <node concept="Xjq3P" id="2gPa6JI$ZiP" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2gPa6JI$ZiQ" role="2OqNvi">
+                <ref role="2Oxat5" node="6OXbTDxtYkB" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2gPa6JI$ZiR" role="3cqZAp">
+          <node concept="37vLTI" id="2gPa6JI$ZiS" role="3clFbG">
+            <node concept="2OqwBi" id="2gPa6JI$ZiT" role="37vLTJ">
+              <node concept="Xjq3P" id="2gPa6JI$ZiU" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2gPa6JI$ZiV" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2gPa6JI$ZiW" role="37vLTx">
+              <ref role="3cqZAo" node="2gPa6JI$ZiE" resolve="ruleProcessingSession" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2gPa6JI$ZiX" role="3cqZAp">
+          <node concept="37vLTI" id="2gPa6JI$ZiY" role="3clFbG">
+            <node concept="2OqwBi" id="2gPa6JI$ZiZ" role="37vLTJ">
+              <node concept="Xjq3P" id="2gPa6JI$Zj0" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2gPa6JI$Zj1" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9b_iR" resolve="queryTemplate" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2gPa6JI$Zj2" role="37vLTx">
+              <ref role="3cqZAo" node="2gPa6JI$ZiG" resolve="queryTemplate" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2gPa6JI$Zj3" role="3cqZAp">
+          <node concept="37vLTI" id="2gPa6JI$Zj4" role="3clFbG">
+            <node concept="2OqwBi" id="2gPa6JI$Zj5" role="37vLTJ">
+              <node concept="Xjq3P" id="2gPa6JI$Zj6" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2gPa6JI$Zj7" role="2OqNvi">
+                <ref role="2Oxat5" node="61G6TdBoK17" resolve="applicationSession" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2gPa6JI$Zj8" role="37vLTx">
+              <ref role="3cqZAo" node="2gPa6JI$ZiC" resolve="applicationSession" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2gPa6JI$Zi$" role="jymVt" />
     <node concept="3clFb_" id="6nFpYluWwIS" role="jymVt">
       <property role="TrG5h" value="setOriginIndex" />
       <node concept="37vLTG" id="6nFpYluWzZK" role="3clF46">
@@ -4250,9 +4340,20 @@
     <node concept="3clFb_" id="1imVejVAvuv" role="jymVt">
       <property role="TrG5h" value="initialStore" />
       <node concept="3clFbS" id="1imVejVAvuy" role="3clF47">
-        <node concept="3clFbF" id="1imVejVB9zs" role="3cqZAp">
-          <node concept="37vLTw" id="1imVejVB9zr" role="3clFbG">
-            <ref role="3cqZAo" node="1imVejVAyjK" resolve="initialStore" />
+        <node concept="1X3_iC" id="2gPa6JItNHm" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="1imVejVB9zs" role="8Wnug">
+            <node concept="37vLTw" id="1imVejVB9zr" role="3clFbG">
+              <ref role="3cqZAo" node="1imVejVAyjK" resolve="initialStore" />
+            </node>
+          </node>
+        </node>
+        <node concept="YS8fn" id="2gPa6JItOBC" role="3cqZAp">
+          <node concept="2ShNRf" id="2gPa6JItOC8" role="YScLw">
+            <node concept="1pGfFk" id="2gPa6JItPDM" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
           </node>
         </node>
       </node>
@@ -4345,18 +4446,18 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="1imVejV_lwF" role="3cqZAp">
-          <node concept="3cpWsn" id="1imVejV_lwG" role="3cpWs9">
-            <property role="TrG5h" value="cachedResultsFilter" />
-            <node concept="3uibUv" id="1imVejV_lwH" role="1tU5fm">
-              <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
-            </node>
-            <node concept="2OqwBi" id="1imVejVAsJW" role="33vP2m">
-              <node concept="37vLTw" id="1imVejVAsqq" role="2Oq$k0">
-                <ref role="3cqZAo" node="1imVejVAllg" resolve="occurrenceCache" />
+        <node concept="1X3_iC" id="2gPa6JIDNwU" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3cpWs8" id="1imVejV_lwF" role="8Wnug">
+            <node concept="3cpWsn" id="1imVejV_lwG" role="3cpWs9">
+              <property role="TrG5h" value="cachedResultsFilter" />
+              <node concept="3uibUv" id="1imVejV_lwH" role="1tU5fm">
+                <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
               </node>
-              <node concept="liA8E" id="1imVejVAt8M" role="2OqNvi">
-                <ref role="37wK5l" to="i348:1imVejV_97e" resolve="toFilter" />
+              <node concept="10M0yZ" id="2gPa6JIusoL" role="33vP2m">
+                <ref role="3cqZAo" to="i348:5F2qBBEpoqL" resolve="EMPTY" />
+                <ref role="1PxDUh" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
               </node>
             </node>
           </node>
@@ -4473,9 +4574,6 @@
                 <node concept="37vLTw" id="6nFpYluWEsS" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYluW$vz" resolve="originIndex" />
                 </node>
-                <node concept="37vLTw" id="1imVejV_md6" role="37wK5m">
-                  <ref role="3cqZAo" node="1imVejV_lwG" resolve="cachedResultsFilter" />
-                </node>
                 <node concept="37vLTw" id="6nFpYlukSZ2" role="37wK5m">
                   <ref role="3cqZAo" node="6nFpYlu8ju5" resolve="updatesRecorder" />
                 </node>
@@ -4609,28 +4707,32 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbF" id="1imVejVAz4t" role="3cqZAp">
-                  <node concept="37vLTI" id="1imVejVB2DR" role="3clFbG">
-                    <node concept="2OqwBi" id="1imVejVB2QO" role="37vLTx">
-                      <node concept="37vLTw" id="1imVejVB2Hs" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1imVejVAllg" resolve="occurrenceCache" />
-                      </node>
-                      <node concept="liA8E" id="1imVejVB32M" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:1imVejVABtA" resolve="getAll" />
-                        <node concept="2OqwBi" id="1imVejVB3AY" role="37wK5m">
-                          <node concept="37vLTw" id="1imVejVB3f4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1imVejV_lwG" resolve="cachedResultsFilter" />
-                          </node>
-                          <node concept="liA8E" id="1imVejVB3P5" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:1imVejVyfmY" resolve="getSkippedApplications" />
+                <node concept="1X3_iC" id="2gPa6JItN1q" role="lGtFl">
+                  <property role="3V$3am" value="statement" />
+                  <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                  <node concept="3clFbF" id="1imVejVAz4t" role="8Wnug">
+                    <node concept="37vLTI" id="1imVejVB2DR" role="3clFbG">
+                      <node concept="2OqwBi" id="1imVejVB2QO" role="37vLTx">
+                        <node concept="37vLTw" id="1imVejVB2Hs" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1imVejVAllg" resolve="occurrenceCache" />
+                        </node>
+                        <node concept="liA8E" id="1imVejVB32M" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:1imVejVABtA" resolve="getAll" />
+                          <node concept="2OqwBi" id="1imVejVB3AY" role="37wK5m">
+                            <node concept="37vLTw" id="1imVejVB3f4" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1imVejV_lwG" resolve="cachedResultsFilter" />
+                            </node>
+                            <node concept="liA8E" id="1imVejVB3P5" role="2OqNvi">
+                              <ref role="37wK5l" to="i348:1imVejVyfmY" resolve="getSkippedApplications" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="2OqwBi" id="1imVejVAzcK" role="37vLTJ">
-                      <node concept="Xjq3P" id="1imVejVAz4r" role="2Oq$k0" />
-                      <node concept="2OwXpG" id="1imVejVAzjA" role="2OqNvi">
-                        <ref role="2Oxat5" node="1imVejVAyjK" resolve="initialStore" />
+                      <node concept="2OqwBi" id="1imVejVAzcK" role="37vLTJ">
+                        <node concept="Xjq3P" id="1imVejVAz4r" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="1imVejVAzjA" role="2OqNvi">
+                          <ref role="2Oxat5" node="1imVejVAyjK" resolve="initialStore" />
+                        </node>
                       </node>
                     </node>
                   </node>
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 6277bfb9..02b98bcf 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
@@ -943,12 +943,6 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
-      <node concept="37vLTG" id="5F2qBBEoUdy" role="3clF46">
-        <property role="TrG5h" value="templateFilter" />
-        <node concept="3uibUv" id="5F2qBBEp7wZ" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
-        </node>
-      </node>
       <node concept="37vLTG" id="2hQbw6HCsn9" role="3clF46">
         <property role="TrG5h" value="staticRules" />
         <node concept="10P_77" id="2hQbw6HCBcP" role="1tU5fm" />
@@ -991,9 +985,6 @@
               <node concept="37vLTw" id="3OUB6BCcNeG" role="37wK5m">
                 <ref role="3cqZAo" node="3OUB6BCcGW4" resolve="node" />
               </node>
-              <node concept="37vLTw" id="5F2qBBEpjxU" role="37wK5m">
-                <ref role="3cqZAo" node="5F2qBBEoUdy" resolve="templateFilter" />
-              </node>
               <node concept="37vLTw" id="2D0V9mfxCNb" role="37wK5m">
                 <ref role="3cqZAo" node="2hQbw6HCsn9" resolve="staticRules" />
               </node>
@@ -1598,10 +1589,6 @@
                 <ref role="3cqZAo" node="7DvO2M9Uahq" resolve="key" />
               </node>
               <node concept="10Nm6u" id="1XKnVPl1dn" role="37wK5m" />
-              <node concept="10M0yZ" id="5F2qBBEpxNy" role="37wK5m">
-                <ref role="3cqZAo" to="i348:5F2qBBEpoqL" resolve="EMPTY" />
-                <ref role="1PxDUh" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
-              </node>
               <node concept="3clFbT" id="2hQbw6HJPW5" role="37wK5m" />
               <node concept="1bVj0M" id="47oVduOCnI8" role="37wK5m">
                 <node concept="3clFbS" id="47oVduOCnIa" role="1bW5cS">
@@ -3245,12 +3232,6 @@
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
         </node>
-        <node concept="37vLTG" id="5F2qBBEpyFR" role="3clF46">
-          <property role="TrG5h" value="templateFilter" />
-          <node concept="3uibUv" id="5F2qBBEpELJ" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
-          </node>
-        </node>
         <node concept="37vLTG" id="2hQbw6HI6yJ" role="3clF46">
           <property role="TrG5h" value="staticRules" />
           <node concept="10P_77" id="2hQbw6HIggI" role="1tU5fm" />
@@ -3334,56 +3315,6 @@
                 </node>
               </node>
               <node concept="3clFbH" id="5F2qBBEtoSV" role="3cqZAp" />
-              <node concept="3clFbJ" id="5F2qBBEpR8Z" role="3cqZAp">
-                <node concept="3clFbS" id="5F2qBBEpR91" role="3clFbx">
-                  <node concept="3cpWs8" id="5F2qBBEzATB" role="3cqZAp">
-                    <node concept="3cpWsn" id="5F2qBBEzATC" role="3cpWs9">
-                      <property role="TrG5h" value="noRuleIds" />
-                      <node concept="3vKaQO" id="5F2qBBEzATD" role="1tU5fm">
-                        <node concept="3uibUv" id="5F2qBBEzATE" role="3O5elw">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                      </node>
-                      <node concept="2YIFZM" id="5F2qBBEzATF" role="33vP2m">
-                        <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-                        <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs6" id="5F2qBBErJ$d" role="3cqZAp">
-                    <node concept="1Ls8ON" id="5F2qBBErJ$e" role="3cqZAk">
-                      <node concept="37vLTw" id="5F2qBBEzU5h" role="1Lso8e">
-                        <ref role="3cqZAo" node="5F2qBBEzATC" resolve="noRuleIds" />
-                      </node>
-                      <node concept="37vLTw" id="5F2qBBErJ$g" role="1Lso8e">
-                        <ref role="3cqZAo" node="47oVduOFP_0" resolve="cachedRequired" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="5F2qBBEqSh0" role="3clFbw">
-                  <node concept="37vLTw" id="5F2qBBEpZ7l" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5F2qBBEpyFR" resolve="templateFilter" />
-                  </node>
-                  <node concept="liA8E" id="5F2qBBEqSUq" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:1imVejVxZp5" resolve="skipApplication" />
-                    <node concept="1Ls8ON" id="5F2qBBEqT8Y" role="37wK5m">
-                      <node concept="2OqwBi" id="5F2qBBEqTt0" role="1Lso8e">
-                        <node concept="37vLTw" id="5F2qBBEqTiT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5NUR$OCWAB" resolve="template" />
-                        </node>
-                        <node concept="liA8E" id="5F2qBBEqU4p" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:4vBwiiUVL7_" resolve="name" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="5F2qBBEqUdf" role="1Lso8e">
-                        <ref role="3cqZAo" node="5NUR$OCWAD" resolve="node" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="5F2qBBEpHlD" role="3cqZAp" />
               <node concept="3cpWs8" id="4baZKvb6gnB" role="3cqZAp">
                 <node concept="3cpWsn" id="4baZKvb6gnC" role="3cpWs9">
                   <property role="TrG5h" value="validated" />
@@ -3679,56 +3610,6 @@
             </node>
           </node>
           <node concept="3clFbH" id="47oVduOJe2a" role="3cqZAp" />
-          <node concept="3clFbJ" id="5F2qBBEsAKg" role="3cqZAp">
-            <node concept="3clFbS" id="5F2qBBEsAKh" role="3clFbx">
-              <node concept="3cpWs8" id="5F2qBBEyo4Q" role="3cqZAp">
-                <node concept="3cpWsn" id="5F2qBBEyo4T" role="3cpWs9">
-                  <property role="TrG5h" value="noRuleIds" />
-                  <node concept="3vKaQO" id="5F2qBBEyo4U" role="1tU5fm">
-                    <node concept="3uibUv" id="5F2qBBEziOI" role="3O5elw">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                    </node>
-                  </node>
-                  <node concept="2YIFZM" id="5F2qBBEyo4W" role="33vP2m">
-                    <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
-                    <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="5F2qBBEsAKi" role="3cqZAp">
-                <node concept="1Ls8ON" id="5F2qBBEsAKj" role="3cqZAk">
-                  <node concept="37vLTw" id="5F2qBBEywvs" role="1Lso8e">
-                    <ref role="3cqZAo" node="5F2qBBEyo4T" resolve="noRuleIds" />
-                  </node>
-                  <node concept="37vLTw" id="5F2qBBEsK0S" role="1Lso8e">
-                    <ref role="3cqZAo" node="47oVduOIlWD" resolve="reqs" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="5F2qBBEsAKm" role="3clFbw">
-              <node concept="37vLTw" id="5F2qBBEsAKn" role="2Oq$k0">
-                <ref role="3cqZAo" node="5F2qBBEpyFR" resolve="templateFilter" />
-              </node>
-              <node concept="liA8E" id="5F2qBBEsAKo" role="2OqNvi">
-                <ref role="37wK5l" to="i348:1imVejVxZp5" resolve="skipApplication" />
-                <node concept="1Ls8ON" id="5F2qBBEsAKp" role="37wK5m">
-                  <node concept="2OqwBi" id="5F2qBBEsAKq" role="1Lso8e">
-                    <node concept="37vLTw" id="5F2qBBEsAKr" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5NUR$OCWAB" resolve="template" />
-                    </node>
-                    <node concept="liA8E" id="5F2qBBEsAKs" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:4vBwiiUVL7_" resolve="name" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="5F2qBBEsAKt" role="1Lso8e">
-                    <ref role="3cqZAo" node="5NUR$OCWAD" resolve="node" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="5F2qBBEKu_g" role="3cqZAp" />
           <node concept="3cpWs8" id="4baZKvb26tb" role="3cqZAp">
             <node concept="3cpWsn" id="4baZKvb26tc" role="3cpWs9">
               <property role="TrG5h" value="ids" />
@@ -6731,19 +6612,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7wgfyCWYipi" role="3cqZAp">
-          <node concept="37vLTI" id="7wgfyCWYjWS" role="3clFbG">
-            <node concept="37vLTw" id="7wgfyCWYmcx" role="37vLTx">
-              <ref role="3cqZAo" node="7wgfyCWXU8J" resolve="knownOccurrences" />
-            </node>
-            <node concept="2OqwBi" id="7wgfyCWYiBT" role="37vLTJ">
-              <node concept="Xjq3P" id="7wgfyCWYipg" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7wgfyCWYiNE" role="2OqNvi">
-                <ref role="2Oxat5" node="7wgfyCWYacZ" resolve="rulesFilter" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="6nFpYlujV$2" role="3cqZAp">
           <node concept="37vLTI" id="6nFpYlujV$4" role="3clFbG">
             <node concept="2OqwBi" id="6nFpYluk4M4" role="37vLTJ">
@@ -6782,12 +6650,6 @@
           <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
         </node>
       </node>
-      <node concept="37vLTG" id="7wgfyCWXU8J" role="3clF46">
-        <property role="TrG5h" value="knownOccurrences" />
-        <node concept="3uibUv" id="1imVejVykdC" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
-        </node>
-      </node>
       <node concept="37vLTG" id="6nFpYlujKf7" role="3clF46">
         <property role="TrG5h" value="updatesRecorder" />
         <node concept="3uibUv" id="6nFpYlujNlq" role="1tU5fm">
@@ -8680,9 +8542,6 @@
                         <node concept="37vLTw" id="47oVduO_Y8r" role="37wK5m">
                           <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                         </node>
-                        <node concept="37vLTw" id="5F2qBBEoP1J" role="37wK5m">
-                          <ref role="3cqZAo" node="7wgfyCWYacZ" resolve="rulesFilter" />
-                        </node>
                         <node concept="37vLTw" id="2D0V9mfxon2" role="37wK5m">
                           <ref role="3cqZAo" node="5HxDM7D4Qx4" resolve="isPreamble" />
                         </node>
@@ -12037,13 +11896,6 @@
         <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
       </node>
     </node>
-    <node concept="312cEg" id="7wgfyCWYacZ" role="jymVt">
-      <property role="TrG5h" value="rulesFilter" />
-      <node concept="3Tm6S6" id="7wgfyCWY2SW" role="1B3o_S" />
-      <node concept="3uibUv" id="1imVejVykq$" role="1tU5fm">
-        <ref role="3uigEE" to="i348:1imVejVxYQd" resolve="TemplateApplicationFilter" />
-      </node>
-    </node>
     <node concept="312cEg" id="6nFpYlujVzU" role="jymVt">
       <property role="TrG5h" value="updatesRecorder" />
       <node concept="3Tm6S6" id="6nFpYlujVzV" role="1B3o_S" />
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 578f3b60..e3c36635 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
@@ -3409,7 +3409,7 @@
                   </node>
                   <node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
                     <node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
-                      <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramProducer" />
+                      <ref role="37wK5l" to="hano:2gPa6JI$Zi_" resolve="ProgramProducer" />
                       <node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
                         <property role="Xl_RC" value="test" />
                       </node>
@@ -3422,11 +3422,6 @@
                       <node concept="37vLTw" id="6OXbTD_ouEx" role="37wK5m">
                         <ref role="3cqZAo" node="6OXbTD_oqui" resolve="queryTemplate" />
                       </node>
-                      <node concept="2ShNRf" id="1imVejVAmxY" role="37wK5m">
-                        <node concept="HV5vD" id="1imVejVAn7b" role="2ShVmc">
-                          <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-                        </node>
-                      </node>
                     </node>
                   </node>
                 </node>
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 4c8ee64a..7b3a3121 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
@@ -451,6 +451,13 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -17244,31 +17251,35 @@
             </node>
           </node>
           <node concept="3clFbH" id="1XKnVOCXGA" role="3cqZAp" />
-          <node concept="3cpWs8" id="1imVejVC0fy" role="3cqZAp">
-            <node concept="3cpWsn" id="1imVejVC0fz" role="3cpWs9">
-              <property role="TrG5h" value="cachedOccurrences" />
-              <node concept="3uibUv" id="1imVejVC0f$" role="1tU5fm">
-                <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-              </node>
-              <node concept="2OqwBi" id="1imVejVC18r" role="33vP2m">
-                <node concept="1rXfSq" id="1imVejVC0sN" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getAspectCachedData" />
-                  <node concept="37vLTw" id="1imVejVC0KO" role="37wK5m">
-                    <ref role="3cqZAo" node="6XnUDeizCc7" resolve="aspectClique" />
-                  </node>
+          <node concept="1X3_iC" id="2gPa6JIullG" role="lGtFl">
+            <property role="3V$3am" value="statement" />
+            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+            <node concept="3cpWs8" id="1imVejVC0fy" role="8Wnug">
+              <node concept="3cpWsn" id="1imVejVC0fz" role="3cpWs9">
+                <property role="TrG5h" value="cachedOccurrences" />
+                <node concept="3uibUv" id="1imVejVC0f$" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
                 </node>
-                <node concept="liA8E" id="1imVejVC1yV" role="2OqNvi">
-                  <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
-                  <node concept="10M0yZ" id="1imVejVC2Pr" role="37wK5m">
-                    <ref role="3cqZAo" node="7wgfyCWWZq3" resolve="PRINCIPAL_STORE" />
-                    <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                <node concept="2OqwBi" id="1imVejVC18r" role="33vP2m">
+                  <node concept="1rXfSq" id="1imVejVC0sN" role="2Oq$k0">
+                    <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getAspectCachedData" />
+                    <node concept="37vLTw" id="1imVejVC0KO" role="37wK5m">
+                      <ref role="3cqZAo" node="6XnUDeizCc7" resolve="aspectClique" />
+                    </node>
                   </node>
-                  <node concept="1bVj0M" id="1imVejVC3v$" role="37wK5m">
-                    <node concept="3clFbS" id="1imVejVC3vA" role="1bW5cS">
-                      <node concept="3clFbF" id="1imVejVC3Gb" role="3cqZAp">
-                        <node concept="2ShNRf" id="1imVejVC3G9" role="3clFbG">
-                          <node concept="HV5vD" id="1imVejVC4E9" role="2ShVmc">
-                            <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
+                  <node concept="liA8E" id="1imVejVC1yV" role="2OqNvi">
+                    <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                    <node concept="10M0yZ" id="1imVejVC2Pr" role="37wK5m">
+                      <ref role="3cqZAo" node="7wgfyCWWZq3" resolve="PRINCIPAL_STORE" />
+                      <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                    </node>
+                    <node concept="1bVj0M" id="1imVejVC3v$" role="37wK5m">
+                      <node concept="3clFbS" id="1imVejVC3vA" role="1bW5cS">
+                        <node concept="3clFbF" id="1imVejVC3Gb" role="3cqZAp">
+                          <node concept="2ShNRf" id="1imVejVC3G9" role="3clFbG">
+                            <node concept="HV5vD" id="1imVejVC4E9" role="2ShVmc">
+                              <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -17315,9 +17326,7 @@
                 <node concept="37vLTw" id="6XnUDeizCcV" role="37wK5m">
                   <ref role="3cqZAo" node="6XnUDeizCcf" resolve="query" />
                 </node>
-                <node concept="37vLTw" id="1imVejVC4Ok" role="37wK5m">
-                  <ref role="3cqZAo" node="1imVejVC0fz" resolve="cachedOccurrences" />
-                </node>
+                <node concept="10Nm6u" id="2gPa6JIuj_Z" role="37wK5m" />
               </node>
             </node>
           </node>
@@ -17484,10 +17493,7 @@
                       </node>
                       <node concept="liA8E" id="57Rdq$NvAXO" role="2OqNvi">
                         <ref role="37wK5l" to="xnrr:57Rdq$NuMzc" resolve="setLevel" />
-                        <node concept="Rm8GO" id="57Rdq$NvVWN" role="37wK5m">
-                          <ref role="Rm8GQ" to="av0y:~IncrementalSpec$IncrLevel.Preamble" resolve="Preamble" />
-                          <ref role="1Px2BO" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
-                        </node>
+                        <node concept="10Nm6u" id="2gPa6JHY3FU" role="37wK5m" />
                       </node>
                     </node>
                     <node concept="liA8E" id="57Rdq$NvAXQ" role="2OqNvi">
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 1567dd8f..b49c0d7e 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -552,11 +552,7 @@
           <node concept="37vLTw" id="1imVejVBWUS" role="37wK5m">
             <ref role="3cqZAo" node="5EDW3XEoy5X" resolve="query" />
           </node>
-          <node concept="2ShNRf" id="1imVejVBY6s" role="37wK5m">
-            <node concept="HV5vD" id="1imVejVBYRA" role="2ShVmc">
-              <ref role="HV5vE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-            </node>
-          </node>
+          <node concept="10Nm6u" id="2gPa6JIzIh1" role="37wK5m" />
         </node>
       </node>
       <node concept="37vLTG" id="5EDW3XEoy5P" role="3clF46">
@@ -711,19 +707,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1imVejVBILN" role="3cqZAp">
-          <node concept="37vLTI" id="1imVejVBK0l" role="3clFbG">
-            <node concept="37vLTw" id="1imVejVBKO6" role="37vLTx">
-              <ref role="3cqZAo" node="1imVejVBGUx" resolve="cachedOcccurrences" />
-            </node>
-            <node concept="2OqwBi" id="1imVejVBJia" role="37vLTJ">
-              <node concept="Xjq3P" id="1imVejVBILL" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1imVejVBJ_h" role="2OqNvi">
-                <ref role="2Oxat5" node="1imVejVA7w_" resolve="store" />
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="37vLTG" id="1imVejVB$A7" role="3clF46">
         <property role="TrG5h" value="session" />
@@ -768,7 +751,7 @@
         </node>
       </node>
       <node concept="37vLTG" id="1imVejVBGUx" role="3clF46">
-        <property role="TrG5h" value="cachedOcccurrences" />
+        <property role="TrG5h" value="ignore" />
         <node concept="3uibUv" id="1imVejVBI01" role="1tU5fm">
           <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
         </node>
@@ -943,7 +926,7 @@
                         <node concept="37vLTI" id="3bpBM3Qd930" role="3clFbG">
                           <node concept="2ShNRf" id="3bpBM3Qd2l1" role="37vLTx">
                             <node concept="1pGfFk" id="3bpBM3Qd2l2" role="2ShVmc">
-                              <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramProducer" />
+                              <ref role="37wK5l" to="hano:2gPa6JI$Zi_" resolve="ProgramProducer" />
                               <node concept="37vLTw" id="3bpBM3Qd2l4" role="37wK5m">
                                 <ref role="3cqZAo" node="Hg6Enc4Wb5" resolve="nameHint" />
                               </node>
@@ -956,9 +939,6 @@
                               <node concept="1rXfSq" id="6nFpYluVY5_" role="37wK5m">
                                 <ref role="37wK5l" node="6nFpYluVUvm" resolve="queryTemplate" />
                               </node>
-                              <node concept="37vLTw" id="1imVejVAcWg" role="37wK5m">
-                                <ref role="3cqZAo" node="1imVejVA7w_" resolve="store" />
-                              </node>
                             </node>
                           </node>
                           <node concept="37vLTw" id="3bpBM3Qd934" role="37vLTJ">
@@ -1339,14 +1319,6 @@
         <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6nFpYlurIXk" role="jymVt" />
-    <node concept="312cEg" id="1imVejVA7w_" role="jymVt">
-      <property role="TrG5h" value="store" />
-      <node concept="3Tm6S6" id="1imVejVA6kW" role="1B3o_S" />
-      <node concept="3uibUv" id="1imVejVA7ic" role="1tU5fm">
-        <ref role="3uigEE" to="i348:1imVejVtN6P" resolve="PrincipalStore" />
-      </node>
-    </node>
   </node>
   <node concept="312cEu" id="1pPth$lAzAx">
     <property role="2bfB8j" value="false" />