diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
index 697c00a27035..2b6cca6ae37f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.codeInsight.template;
 
-import com.intellij.codeInsight.template.impl.TemplateContext;
 import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.codeInsight.template.impl.TemplateSettings;
@@ -76,31 +75,31 @@ public class CustomTemplateCallback {
   }
 
   @Nullable
-  public TemplateImpl findApplicableTemplate(@NotNull String key, TemplateContextType... contextTypes) {
-    List<TemplateImpl> templates = findApplicableTemplates(key, contextTypes);
+  public TemplateImpl findApplicableTemplate(@NotNull String key) {
+    List<TemplateImpl> templates = findApplicableTemplates(key);
     return templates.size() > 0 ? templates.get(0) : null;
   }
 
   @NotNull
-  public List<TemplateImpl> findApplicableTemplates(String key, TemplateContextType... contextTypes) {
+  public List<TemplateImpl> findApplicableTemplates(String key) {
     List<TemplateImpl> templates = getMatchingTemplates(key);
-    templates = filterApplicableCandidates(templates, contextTypes);
+    templates = filterApplicableCandidates(templates);
     return templates;
   }
 
-  private List<TemplateImpl> filterApplicableCandidates(Collection<TemplateImpl> candidates, TemplateContextType... contextTypes) {
+  private List<TemplateImpl> filterApplicableCandidates(Collection<TemplateImpl> candidates) {
     List<TemplateImpl> result = new ArrayList<TemplateImpl>();
     for (TemplateImpl candidate : candidates) {
       if (TemplateManagerImpl.isApplicable(myFile, myOffset > 0 ? myOffset - 1 : myOffset, candidate)) {
         result.add(candidate);
       }
-      TemplateContext context = candidate.getTemplateContext();
+      /*TemplateContext context = candidate.getTemplateContext();
       for (TemplateContextType contextType : contextTypes) {
         if (context.isEnabled(contextType)) {
           result.add(candidate);
           break;
         }
-      }
+      }*/
     }
     return result;
   }
diff --git a/xml/impl/resources/liveTemplates/zen_html.xml b/xml/impl/resources/liveTemplates/zen_html.xml
index 97584af43ad1..16191af32e4e 100644
--- a/xml/impl/resources/liveTemplates/zen_html.xml
+++ b/xml/impl/resources/liveTemplates/zen_html.xml
@@ -6,7 +6,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="html:4t" toReformat="true" toShortenFQNames="true" value="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;&#10;&lt;html lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;  &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;  &lt;title&gt;&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
@@ -15,7 +14,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="cc:ie6" toReformat="true" toShortenFQNames="true" value="&lt;!--[if lte IE 6]&gt;&#10;  $END$&#10;&lt;![endif]--&gt;">
@@ -23,7 +21,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="html:4s" toReformat="true" toShortenFQNames="true" value="&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;&#10;&lt;html lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;  &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;&#10;  &lt;title&gt;&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
@@ -32,7 +29,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="cc:noie" toReformat="true" toShortenFQNames="true" value="&lt;!--[if !IE]&gt;&lt;!--&gt;&#10;  $END$&#10;&lt;!--&lt;![endif]--&gt;">
@@ -40,7 +36,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="html:5" toReformat="true" toShortenFQNames="true" value="&lt;!DOCTYPE HTML&gt;&#10;&lt;html lang=&quot;$ENV_LOCALE$&quot;&gt;&#10;&lt;head&gt;&#10;  &lt;meta charset=&quot;UTF-8&quot;&gt;&#10;  &lt;title&gt;&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
@@ -49,7 +44,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="cc:ie" toReformat="true" toShortenFQNames="true" value="&lt;!--[if IE]&gt;&#10;  $END$&#10;&lt;![endif]--&gt;">
@@ -57,7 +51,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="html:xt" toReformat="true" toShortenFQNames="true" value="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;&#10;&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;  &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot; /&gt;&#10;  &lt;title&gt;&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
@@ -66,7 +59,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="html:xxs" toReformat="true" toShortenFQNames="true" value="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.1//EN&quot; &quot;http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd&quot;&gt;&#10;&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;$ENV_LANG$&quot;&gt;&#10;&lt;head&gt;&#10;  &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot; /&gt;&#10;  &lt;title&gt;&lt;/title&gt;&#10;&lt;/head&gt;&#10;&lt;body&gt;&#10;  $END$&#10;&lt;/body&gt;&#10;&lt;/html&gt;">
@@ -75,7 +67,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;a href=&quot;http://...&quot;&gt;...&lt;/a&gt;" name="a:link" toReformat="true" toShortenFQNames="true" value="&lt;a href=&quot;http://$VAR0$&quot;&gt;$END$&lt;/a&gt;">
@@ -84,7 +75,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;datetime-local&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:datetime-local" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;datetime-local&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -94,7 +84,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;reset&quot; value=&quot;...&quot;&gt;" name="input:reset" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;reset&quot; value=&quot;$VAR0$&quot;&gt;">
@@ -103,7 +92,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;colgroup&gt;...&lt;/colgroup&gt;" name="colg" toReformat="true" toShortenFQNames="true" value="&lt;colgroup&gt;$END$&lt;/colgroup&gt;">
@@ -111,7 +99,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;style type=&quot;text/css&quot;&gt;...&lt;/style&gt;" name="style" toReformat="true" toShortenFQNames="true" value="&lt;style type=&quot;text/css&quot;&gt;$END$&lt;/style&gt;">
@@ -119,7 +106,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;address&gt;...&lt;/address&gt;" name="adr" toReformat="true" toShortenFQNames="true" value="&lt;address&gt;$END$&lt;/address&gt;">
@@ -127,7 +113,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;img src=&quot;...&quot; alt=&quot;...&quot;&gt;" name="img" toReformat="true" toShortenFQNames="true" value="&lt;img src=&quot;$VAR0$&quot; alt=&quot;$VAR1$&quot;&gt;">
@@ -137,7 +122,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;bdo dir=&quot;ltr&quot;&gt;...&lt;/bdo&gt;" name="bdo:l" toReformat="true" toShortenFQNames="true" value="&lt;bdo dir=&quot;ltr&quot;&gt;$END$&lt;/bdo&gt;">
@@ -145,7 +129,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;param name=&quot;...&quot; value=&quot;...&quot;&gt;" name="param" toReformat="true" toShortenFQNames="true" value="&lt;param name=&quot;$VAR0$&quot; value=&quot;$VAR1$&quot;&gt;">
@@ -155,7 +138,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="colgroup+" toReformat="true" toShortenFQNames="true" value="&lt;colgroup&gt;&#10;  &lt;col&gt;&#10;&lt;/colgroup&gt;">
@@ -163,7 +145,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;form action=&quot;...&quot; method=&quot;post&quot;&gt;...&lt;/form&gt;" name="form:post" toReformat="true" toShortenFQNames="true" value="&lt;form action=&quot;$VAR0$&quot; method=&quot;post&quot;&gt;$END$&lt;/form&gt;">
@@ -172,7 +153,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;bdo dir=&quot;rtl&quot;&gt;...&lt;/bdo&gt;" name="bdo:r" toReformat="true" toShortenFQNames="true" value="&lt;bdo dir=&quot;rtl&quot;&gt;$END$&lt;/bdo&gt;">
@@ -180,7 +160,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;figure&gt;...&lt;/figure&gt;" name="fig" toReformat="true" toShortenFQNames="true" value="&lt;figure&gt;$END$&lt;/figure&gt;">
@@ -188,7 +167,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;radio&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:radio" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;radio&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -198,7 +176,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;...print.css&quot; media=&quot;print&quot;&gt;" name="link:print" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;$END$print.css&quot; media=&quot;print&quot;&gt;">
@@ -206,7 +183,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;option&gt;...&lt;/option&gt;" name="opt" toReformat="true" toShortenFQNames="true" value="&lt;option&gt;$END$&lt;/option&gt;">
@@ -214,7 +190,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;image&quot; src=&quot;...&quot; alt=&quot;...&quot;&gt;" name="input:i" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;image&quot; src=&quot;$VAR0$&quot; alt=&quot;$VAR1$&quot;&gt;">
@@ -224,7 +199,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;hidden&quot; name=&quot;...&quot;&gt;" name="input:h" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;hidden&quot; name=&quot;$VAR0$&quot;&gt;">
@@ -233,7 +207,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;file&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:f" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;file&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -243,7 +216,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;checkbox&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:c" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;checkbox&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -253,7 +225,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;button&quot; value=&quot;...&quot;&gt;" name="input:b" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;button&quot; value=&quot;$VAR0$&quot;&gt;">
@@ -262,7 +233,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;abbr title=&quot;...&quot;&gt;...&lt;/abbr&gt;" name="abbr" toReformat="true" toShortenFQNames="true" value="&lt;abbr title=&quot;$VAR0$&quot;&gt;$END$&lt;/abbr&gt;">
@@ -271,7 +241,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;text&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:t" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;text&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -281,7 +250,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;password&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:p" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;password&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -291,7 +259,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;submit&quot; value=&quot;...&quot;&gt;" name="input:s" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;submit&quot; value=&quot;$VAR0$&quot;&gt;">
@@ -300,7 +267,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;radio&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:r" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;radio&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -310,7 +276,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;iframe&gt;...&lt;/iframe&gt;" name="ifr" toReformat="true" toShortenFQNames="true" value="&lt;iframe&gt;$END$&lt;/iframe&gt;">
@@ -318,7 +283,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;embed&gt;" name="emb" toReformat="true" toShortenFQNames="true" value="&lt;embed&gt;">
@@ -326,7 +290,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="optg+" toReformat="true" toShortenFQNames="true" value="&lt;optgroup&gt;&#10;  &lt;option value=&quot;$VAR0$&quot;&gt;$END$&lt;/option&gt;&#10;&lt;/optgroup&gt;">
@@ -335,7 +298,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;command&gt;" name="cmd" toReformat="true" toShortenFQNames="true" value="&lt;command&gt;">
@@ -343,7 +305,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;alternate&quot; type=&quot;application/atom+xml&quot; title=&quot;Atom&quot; href=&quot;atom.xml&quot;&gt;" name="link:atom" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;alternate&quot; type=&quot;application/atom+xml&quot; title=&quot;Atom&quot; href=&quot;atom.xml&quot;&gt;">
@@ -351,7 +312,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="table+" toReformat="true" toShortenFQNames="true" value="&lt;table&gt;&#10;  &lt;tr&gt;&#10;    &lt;td&gt;$END$&lt;/td&gt;&#10;  &lt;/tr&gt;&#10;&lt;/table&gt;">
@@ -359,7 +319,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;article&gt;...&lt;/article&gt;" name="art" toReformat="true" toShortenFQNames="true" value="&lt;article&gt;$END$&lt;/article&gt;">
@@ -367,7 +326,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;search&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:search" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;search&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -377,7 +335,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;area shape=&quot;rect&quot; coords=&quot;...&quot; href=&quot;...&quot; alt=&quot;...&quot;&gt;" name="area:r" toReformat="true" toShortenFQNames="true" value="&lt;area shape=&quot;rect&quot; coords=&quot;$VAR0$&quot; href=&quot;$VAR1$&quot; alt=&quot;$VAR2$&quot;&gt;">
@@ -388,7 +345,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;area shape=&quot;poly&quot; coords=&quot;...&quot; href=&quot;...&quot; alt=&quot;...&quot;&gt;" name="area:p" toReformat="true" toShortenFQNames="true" value="&lt;area shape=&quot;poly&quot; coords=&quot;$VAR0$&quot; href=&quot;$VAR1$&quot; alt=&quot;$VAR2$&quot;&gt;">
@@ -399,7 +355,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;date&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:date" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;date&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -409,7 +364,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;video src=&quot;...&quot;&gt;...&lt;/video&gt;" name="video" toReformat="true" toShortenFQNames="true" value="&lt;video src=&quot;$VAR0$&quot;&gt;$END$&lt;/video&gt;">
@@ -418,7 +372,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;button&quot; value=&quot;...&quot;&gt;" name="input:button" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;button&quot; value=&quot;$VAR0$&quot;&gt;">
@@ -427,7 +380,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;area shape=&quot;default&quot; href=&quot;...&quot; alt=&quot;...&quot;&gt;" name="area:d" toReformat="true" toShortenFQNames="true" value="&lt;area shape=&quot;default&quot; href=&quot;$VAR0$&quot; alt=&quot;$VAR1$&quot;&gt;">
@@ -437,7 +389,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;area shape=&quot;circle&quot; coords=&quot;...&quot; href=&quot;...&quot; alt=&quot;...&quot;&gt;" name="area:c" toReformat="true" toShortenFQNames="true" value="&lt;area shape=&quot;circle&quot; coords=&quot;$VAR0$&quot; href=&quot;$VAR1$&quot; alt=&quot;$VAR2$&quot;&gt;">
@@ -448,7 +399,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;output&gt;...&lt;/output&gt;" name="out" toReformat="true" toShortenFQNames="true" value="&lt;output&gt;$END$&lt;/output&gt;">
@@ -456,7 +406,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;footer&gt;...&lt;/footer&gt;" name="ftr" toReformat="true" toShortenFQNames="true" value="&lt;footer&gt;$END$&lt;/footer&gt;">
@@ -464,7 +413,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;dialog&gt;...&lt;/dialog&gt;" name="dlg" toReformat="true" toShortenFQNames="true" value="&lt;dialog&gt;$END$&lt;/dialog&gt;">
@@ -472,7 +420,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;script type=&quot;text/javascript&quot; src=&quot;...&quot;&gt;...&lt;/script&gt;" name="script:src" toReformat="true" toShortenFQNames="true" value="&lt;script type=&quot;text/javascript&quot; src=&quot;$VAR0$&quot;&gt;$END$&lt;/script&gt;">
@@ -481,7 +428,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;form action=&quot;...&quot; method=&quot;get&quot;&gt;...&lt;/form&gt;" name="form:get" toReformat="true" toShortenFQNames="true" value="&lt;form action=&quot;$VAR0$&quot; method=&quot;get&quot;&gt;$END$&lt;/form&gt;">
@@ -490,7 +436,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;" name="meta:utf" toReformat="true" toShortenFQNames="true" value="&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=UTF-8&quot;&gt;">
@@ -498,7 +443,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;label for=&quot;...&quot;&gt;...&lt;/label&gt;" name="label" toReformat="true" toShortenFQNames="true" value="&lt;label for=&quot;$VAR0$&quot;&gt;$END$&lt;/label&gt;">
@@ -507,7 +451,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;time&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:time" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;time&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -517,7 +460,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;shortcut icon&quot; type=&quot;image/x-icon&quot; href=&quot;...favicon.ico&quot;&gt;" name="link:favicon" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;shortcut icon&quot; type=&quot;image/x-icon&quot; href=&quot;$END$favicon.ico&quot;&gt;">
@@ -525,7 +467,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;menu type=&quot;toolbar&quot;&gt;...&lt;/menu&gt;" name="menu:toolbar" toReformat="true" toShortenFQNames="true" value="&lt;menu type=&quot;toolbar&quot;&gt;$END$&lt;/menu&gt;">
@@ -533,7 +474,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;progress&gt;...&lt;/progress&gt;" name="prog" toReformat="true" toShortenFQNames="true" value="&lt;progress&gt;$END$&lt;/progress&gt;">
@@ -541,7 +481,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;email&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:email" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;email&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -551,7 +490,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;optgroup&gt;...&lt;/optgroup&gt;" name="optg" toReformat="true" toShortenFQNames="true" value="&lt;optgroup&gt;$END$&lt;/optgroup&gt;">
@@ -559,7 +497,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;strong&gt;...&lt;/strong&gt;" name="str" toReformat="true" toShortenFQNames="true" value="&lt;strong&gt;$END$&lt;/strong&gt;">
@@ -567,7 +504,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;legend&gt;...&lt;/legend&gt;" name="leg" toReformat="true" toShortenFQNames="true" value="&lt;legend&gt;$END$&lt;/legend&gt;">
@@ -575,7 +511,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;acronym title=&quot;...&quot;&gt;...&lt;/acronym&gt;" name="acronym" toReformat="true" toShortenFQNames="true" value="&lt;acronym title=&quot;$VAR0$&quot;&gt;$END$&lt;/acronym&gt;">
@@ -584,7 +519,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="ol+" toReformat="true" toShortenFQNames="true" value="&lt;ol&gt;&#10;  &lt;li&gt;$END$&lt;/li&gt;&#10;&lt;/ol&gt;">
@@ -592,7 +526,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="tr+" toReformat="true" toShortenFQNames="true" value="&lt;tr&gt;&#10;  &lt;td&gt;$END$&lt;/td&gt;&#10;&lt;/tr&gt;">
@@ -600,7 +533,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="optgroup+" toReformat="true" toShortenFQNames="true" value="&lt;optgroup&gt;&#10;  &lt;option value=&quot;$VAR0$&quot;&gt;$END$&lt;/option&gt;&#10;&lt;/optgroup&gt;">
@@ -609,7 +541,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;base href=&quot;...&quot;&gt;" name="base" toReformat="true" toShortenFQNames="true" value="&lt;base href=&quot;$VAR0$&quot;&gt;">
@@ -618,7 +549,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;blockquote&gt;...&lt;/blockquote&gt;" name="bq" toReformat="true" toShortenFQNames="true" value="&lt;blockquote&gt;$END$&lt;/blockquote&gt;">
@@ -626,7 +556,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;source&gt;...&lt;/source&gt;" name="src" toReformat="true" toShortenFQNames="true" value="&lt;source&gt;$END$&lt;/source&gt;">
@@ -634,7 +563,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;object&gt;...&lt;/object&gt;" name="obj" toReformat="true" toShortenFQNames="true" value="&lt;object&gt;$END$&lt;/object&gt;">
@@ -642,7 +570,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="dl+" toReformat="true" toShortenFQNames="true" value="&lt;dl&gt;&#10;  &lt;dt&gt;$VAR0$&lt;/dt&gt;&#10;  &lt;dd&gt;$END$&lt;/dd&gt;&#10;&lt;/dl&gt;">
@@ -651,7 +578,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;script type=&quot;text/javascript&quot;&gt;...&lt;/script&gt;" name="script" toReformat="true" toShortenFQNames="true" value="&lt;script type=&quot;text/javascript&quot;&gt;$END$&lt;/script&gt;">
@@ -659,7 +585,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;acronym&gt;...&lt;/acronym&gt;" name="acr" toReformat="true" toShortenFQNames="true" value="&lt;acronym&gt;$END$&lt;/acronym&gt;">
@@ -667,7 +592,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;password&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:password" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;password&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -677,7 +601,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;file&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:file" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;file&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -687,7 +610,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;textarea&gt;...&lt;/textarea&gt;" name="tarea" toReformat="true" toShortenFQNames="true" value="&lt;textarea&gt;$END$&lt;/textarea&gt;">
@@ -695,7 +617,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;select name=&quot;...&quot; id=&quot;...&quot;&gt;...&lt;/select&gt;" name="select" toReformat="true" toShortenFQNames="true" value="&lt;select name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;$END$&lt;/select&gt;">
@@ -705,7 +626,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;number&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:number" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;number&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -715,7 +635,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;range&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:range" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;range&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -725,7 +644,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;area shape=&quot;...&quot; coords=&quot;...&quot; href=&quot;...&quot; alt=&quot;...&quot;&gt;" name="area" toReformat="true" toShortenFQNames="true" value="&lt;area shape=&quot;$VAR0$&quot; coords=&quot;$VAR1$&quot; href=&quot;$VAR2$&quot; alt=&quot;$VAR3$&quot;&gt;">
@@ -737,7 +655,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;image&quot; src=&quot;...&quot; alt=&quot;...&quot;&gt;" name="input:image" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;image&quot; src=&quot;$VAR0$&quot; alt=&quot;$VAR1$&quot;&gt;">
@@ -747,7 +664,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="ul+" toReformat="true" toShortenFQNames="true" value="&lt;ul&gt;&#10;  &lt;li&gt;$END$&lt;/li&gt;&#10;&lt;/ul&gt;">
@@ -755,7 +671,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;month&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:month" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;month&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -765,7 +680,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;fieldset&gt;...&lt;/fieldset&gt;" name="fset" toReformat="true" toShortenFQNames="true" value="&lt;fieldset&gt;$END$&lt;/fieldset&gt;">
@@ -773,7 +687,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=Win-1251&quot;&gt;" name="meta:win" toReformat="true" toShortenFQNames="true" value="&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;charset=Win-1251&quot;&gt;">
@@ -781,7 +694,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;menu type=&quot;toolbar&quot;&gt;...&lt;/menu&gt;" name="menu:t" toReformat="true" toShortenFQNames="true" value="&lt;menu type=&quot;toolbar&quot;&gt;$END$&lt;/menu&gt;">
@@ -789,7 +701,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;form action=&quot;...&quot;&gt;...&lt;/form&gt;" name="form" toReformat="true" toShortenFQNames="true" value="&lt;form action=&quot;$VAR0$&quot;&gt;$END$&lt;/form&gt;">
@@ -798,7 +709,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;menu type=&quot;context&quot;&gt;...&lt;/menu&gt;" name="menu:c" toReformat="true" toShortenFQNames="true" value="&lt;menu type=&quot;context&quot;&gt;$END$&lt;/menu&gt;">
@@ -806,7 +716,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;stylesheet&quot; href=&quot;...&quot;&gt;" name="link" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;stylesheet&quot; href=&quot;$VAR0$&quot;&gt;">
@@ -815,7 +724,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;...&quot;&gt;" name="input" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;$VAR0$&quot;&gt;">
@@ -824,7 +732,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;RSS&quot; href=&quot;...rss.xml&quot;&gt;" name="link:rss" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;alternate&quot; type=&quot;application/rss+xml&quot; title=&quot;RSS&quot; href=&quot;$END$rss.xml&quot;&gt;">
@@ -832,7 +739,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="select+" toReformat="true" toShortenFQNames="true" value="&lt;select name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;&#10;  &lt;option value=&quot;$VAR2$&quot;&gt;$END$&lt;/option&gt;&lt;/select&gt;">
@@ -843,7 +749,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;header&gt;...&lt;/header&gt;" name="hdr" toReformat="true" toShortenFQNames="true" value="&lt;header&gt;$END$&lt;/header&gt;">
@@ -851,7 +756,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;caption&gt;...&lt;/caption&gt;" name="cap" toReformat="true" toShortenFQNames="true" value="&lt;caption&gt;$END$&lt;/caption&gt;">
@@ -859,7 +763,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;details&gt;...&lt;/details&gt;" name="det" toReformat="true" toShortenFQNames="true" value="&lt;details&gt;$END$&lt;/details&gt;">
@@ -867,7 +770,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;apple-touch-icon&quot; href=&quot;...favicon.png&quot;&gt;" name="link:touch" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;apple-touch-icon&quot; href=&quot;$END$favicon.png&quot;&gt;">
@@ -875,7 +777,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;iframe src=&quot;...&quot; frameborder=&quot;0&quot;&gt;...&lt;/iframe&gt;" name="iframe" toReformat="true" toShortenFQNames="true" value="&lt;iframe src=&quot;$VAR0$&quot; frameborder=&quot;0&quot;&gt;$END$&lt;/iframe&gt;">
@@ -884,7 +785,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;...style.css&quot; media=&quot;all&quot;&gt;" name="link:css" toReformat="true" toShortenFQNames="true" value="&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;$END$style.css&quot; media=&quot;all&quot;&gt;">
@@ -892,7 +792,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;week&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:week" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;week&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -902,7 +801,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;embed src=&quot;...&quot; type=&quot;...&quot;&gt;" name="embed" toReformat="true" toShortenFQNames="true" value="&lt;embed src=&quot;$VAR0$&quot; type=&quot;$VAR1$&quot;&gt;">
@@ -912,7 +810,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;datagrid&gt;...&lt;/datagrid&gt;" name="datag" toReformat="true" toShortenFQNames="true" value="&lt;datagrid&gt;$END$&lt;/datagrid&gt;">
@@ -920,7 +817,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;datetime&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:datetime" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;datetime&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -930,7 +826,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;option value=&quot;...&quot;&gt;...&lt;/option&gt;" name="option" toReformat="true" toShortenFQNames="true" value="&lt;option value=&quot;$VAR0$&quot;&gt;$END$&lt;/option&gt;">
@@ -939,7 +834,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;...&lt;/html&gt;" name="html:xml" toReformat="true" toShortenFQNames="true" value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;$END$&lt;/html&gt;">
@@ -947,7 +841,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;button&gt;...&lt;/button&gt;" name="btn" toReformat="true" toShortenFQNames="true" value="&lt;button&gt;$END$&lt;/button&gt;">
@@ -955,7 +848,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;url&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:url" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;url&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -965,7 +857,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;menu type=&quot;context&quot;&gt;...&lt;/menu&gt;" name="menu:context" toReformat="true" toShortenFQNames="true" value="&lt;menu type=&quot;context&quot;&gt;$END$&lt;/menu&gt;">
@@ -973,7 +864,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="colg+" toReformat="true" toShortenFQNames="true" value="&lt;colgroup&gt;&#10;  &lt;col&gt;&#10;&lt;/colgroup&gt;">
@@ -981,7 +871,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;map name=&quot;...&quot;&gt;...&lt;/map&gt;" name="map" toReformat="true" toShortenFQNames="true" value="&lt;map name=&quot;$VAR0$&quot;&gt;$END$&lt;/map&gt;">
@@ -990,7 +879,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;color&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:color" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;color&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -1000,7 +888,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=7&quot;&gt;" name="meta:compat" toReformat="true" toShortenFQNames="true" value="&lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=7&quot;&gt;">
@@ -1008,7 +895,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;hidden&quot; name=&quot;...&quot;&gt;" name="input:hidden" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;hidden&quot; name=&quot;$VAR0$&quot;&gt;">
@@ -1017,7 +903,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;object data=&quot;...&quot; type=&quot;...&quot;&gt;...&lt;/object&gt;" name="object" toReformat="true" toShortenFQNames="true" value="&lt;object data=&quot;$VAR0$&quot; type=&quot;$VAR1$&quot;&gt;$END$&lt;/object&gt;">
@@ -1027,7 +912,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;a href=&quot;mailto:...&quot;&gt;...&lt;/a&gt;" name="a:mail" toReformat="true" toShortenFQNames="true" value="&lt;a href=&quot;mailto:$VAR0$&quot;&gt;$END$&lt;/a&gt;">
@@ -1036,7 +920,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;a href=&quot;...&quot;&gt;...&lt;/a&gt;" name="a" toReformat="true" toShortenFQNames="true" value="&lt;a href=&quot;$VAR0$&quot;&gt;$END$&lt;/a&gt;">
@@ -1045,7 +928,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;datalist&gt;...&lt;/datalist&gt;" name="datal" toReformat="true" toShortenFQNames="true" value="&lt;datalist&gt;$END$&lt;/datalist&gt;">
@@ -1053,7 +935,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;keygen&gt;" name="kg" toReformat="true" toShortenFQNames="true" value="&lt;keygen&gt;">
@@ -1061,7 +942,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;textarea name=&quot;...&quot; id=&quot;...&quot; cols=&quot;30&quot; rows=&quot;10&quot;&gt;...&lt;/textarea&gt;" name="textarea" toReformat="true" toShortenFQNames="true" value="&lt;textarea name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot; cols=&quot;30&quot; rows=&quot;10&quot;&gt;$END$&lt;/textarea&gt;">
@@ -1071,7 +951,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="" name="map+" toReformat="true" toShortenFQNames="true" value="&lt;map name=&quot;$VAR0$&quot;&gt;&#10;  &lt;area shape=&quot;$VAR1$&quot; coords=&quot;$VAR2$&quot; href=&quot;$VAR3$&quot; alt=&quot;$VAR4$&quot;&gt;&lt;/map&gt;">
@@ -1084,7 +963,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;submit&quot; value=&quot;...&quot;&gt;" name="input:submit" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;submit&quot; value=&quot;$VAR0$&quot;&gt;">
@@ -1093,7 +971,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;text&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:text" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;text&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -1103,7 +980,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;input type=&quot;checkbox&quot; name=&quot;...&quot; id=&quot;...&quot;&gt;" name="input:checkbox" toReformat="true" toShortenFQNames="true" value="&lt;input type=&quot;checkbox&quot; name=&quot;$VAR0$&quot; id=&quot;$VAR1$&quot;&gt;">
@@ -1113,7 +989,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;fieldset&gt;...&lt;/fieldset&gt;" name="fst" toReformat="true" toShortenFQNames="true" value="&lt;fieldset&gt;$END$&lt;/fieldset&gt;">
@@ -1121,7 +996,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;section&gt;...&lt;/section&gt;" name="sect" toReformat="true" toShortenFQNames="true" value="&lt;section&gt;$END$&lt;/section&gt;">
@@ -1129,7 +1003,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;audio src=&quot;...&quot;&gt;...&lt;/audio&gt;" name="audio" toReformat="true" toShortenFQNames="true" value="&lt;audio src=&quot;$VAR0$&quot;&gt;$END$&lt;/audio&gt;">
@@ -1138,7 +1011,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
   <template description="&lt;bdo dir=&quot;...&quot;&gt;...&lt;/bdo&gt;" name="bdo" toReformat="true" toShortenFQNames="true" value="&lt;bdo dir=&quot;$VAR0$&quot;&gt;$END$&lt;/bdo&gt;">
@@ -1147,7 +1019,6 @@
       <option name="HTML" value="true"/>
       <option name="XML" value="true"/>
       <option name="JSP" value="true"/>
-      <option name="OTHER" value="true"/>
     </context>
   </template>
 </templateSet>
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
index 38f2968f1bb0..facf3e11f75f 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/ZenCodingTemplate.java
@@ -453,7 +453,7 @@ public class ZenCodingTemplate implements CustomLiveTemplate {
     if (surroundedText == null) {
       if (node instanceof TemplateNode) {
         if (key.equals(((TemplateNode)node).getTemplateToken().getKey()) &&
-            callback.findApplicableTemplates(key, defaultGenerator.getContextTypes()).size() > 1) {
+            callback.findApplicableTemplates(key).size() > 1) {
           callback.startTemplate();
           return;
         }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java b/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java
index 472506fb3748..a84b52058882 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/zencoding/generators/ZenCodingGenerator.java
@@ -16,7 +16,6 @@
 package com.intellij.codeInsight.template.zencoding.generators;
 
 import com.intellij.codeInsight.template.CustomTemplateCallback;
-import com.intellij.codeInsight.template.TemplateContextType;
 import com.intellij.codeInsight.template.impl.TemplateImpl;
 import com.intellij.codeInsight.template.zencoding.ZenCodingTemplate;
 import com.intellij.codeInsight.template.zencoding.tokens.TemplateToken;
@@ -38,8 +37,6 @@ public abstract class ZenCodingGenerator {
   private static final ExtensionPointName<ZenCodingGenerator> EP_NAME =
     new ExtensionPointName<ZenCodingGenerator>("com.intellij.xml.zenCodingGenerator");
 
-  private static final TemplateContextType[] EMPTY_CONTEXT_TYPE_ARRAY = new TemplateContextType[0];
-
   public abstract TemplateImpl generateTemplate(@NotNull TemplateToken token, boolean hasChildren, @NotNull PsiElement context);
 
   @Nullable
@@ -56,10 +53,6 @@ public abstract class ZenCodingGenerator {
 
   public abstract boolean isAppliedByDefault(@NotNull PsiElement context);
 
-  public TemplateContextType[] getContextTypes() {
-    return EMPTY_CONTEXT_TYPE_ARRAY;
-  }
-
   public static List<ZenCodingGenerator> getInstances() {
     List<ZenCodingGenerator> generators = new ArrayList<ZenCodingGenerator>();
     Collections.addAll(generators, XmlZenCodingGeneratorImpl.INSTANCE);