diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
index 3014fb805..fe0fccc00 100644
--- a/src/Latte/Compiler/Compiler.php
+++ b/src/Latte/Compiler/Compiler.php
@@ -42,7 +42,7 @@ class Compiler
 	/** @var string */
 	private $contentType = self::CONTENT_HTML;
 
-	/** @var array [context, subcontext] */
+	/** @var string|NULL */
 	private $context;
 
 	/** @var mixed */
@@ -72,17 +72,23 @@ class Compiler
 
 	/** @internal Context-aware escaping HTML contexts */
 	const
-		// for CONTENT_HTML, CONTENT_XHTML
-		CONTEXT_HTML_TAG = 'tag',
-		CONTEXT_HTML_ATTRIBUTE = 'attr',
-		CONTEXT_HTML_ATTRIBUTE_URL = 'attrurl',
-		CONTEXT_HTML_COMMENT = 'comment',
-		CONTEXT_HTML_BOGUS_COMMENT = 'bogus',
-		CONTEXT_HTML_CSS = 'css',
-		CONTEXT_HTML_JS = 'js',
-
+		CONTEXT_HTML_TEXT = NULL,
+		CONTEXT_HTML_TAG = 'Tag',
+		CONTEXT_HTML_ATTRIBUTE = 'Attr',
+		CONTEXT_HTML_ATTRIBUTE_JS = 'AttrJs',
+		CONTEXT_HTML_ATTRIBUTE_CSS = 'AttrCss',
+		CONTEXT_HTML_ATTRIBUTE_URL = 'AttrUrl',
+		CONTEXT_HTML_ATTRIBUTE_UNQUOTED_URL = 'AttrUnquotedUrl',
+		CONTEXT_HTML_COMMENT = 'Comment',
+		CONTEXT_HTML_BOGUS_COMMENT = 'Bogus',
+		CONTEXT_HTML_CSS = 'Css',
+		CONTEXT_HTML_JS = 'Js',
+
+		CONTEXT_XML_TEXT = self::CONTEXT_HTML_TEXT,
 		CONTEXT_XML_TAG = self::CONTEXT_HTML_TAG,
-		CONTEXT_XML_COMMENT = self::CONTEXT_HTML_COMMENT;
+		CONTEXT_XML_ATTRIBUTE = self::CONTEXT_HTML_ATTRIBUTE,
+		CONTEXT_XML_COMMENT = self::CONTEXT_HTML_COMMENT,
+		CONTEXT_XML_BOGUS_COMMENT = self::CONTEXT_HTML_BOGUS_COMMENT;
 
 
 	/**
@@ -203,9 +209,10 @@ public function getContentType()
 	/**
 	 * @internal
 	 */
-	public function setContext($context, $sub = NULL)
+	public function setContext($context)
 	{
-		$this->context = [$context, $sub];
+		trigger_error(__METHOD__ . ' is deprecated.', E_USER_DEPRECATED);
+		$this->context = $context;
 		return $this;
 	}
 
@@ -301,7 +308,7 @@ public function expandTokens($s)
 
 	private function processText(Token $token)
 	{
-		if ($this->context[0] === self::CONTEXT_HTML_ATTRIBUTE && $this->lastAttrValue === '') {
+		if ($this->lastAttrValue === '' && Helpers::startsWith($this->context, self::CONTEXT_HTML_ATTRIBUTE)) {
 			$this->lastAttrValue = $token->text;
 		}
 		$this->output .= $this->escape($token->text);
@@ -310,7 +317,7 @@ private function processText(Token $token)
 
 	private function processMacroTag(Token $token)
 	{
-		if (in_array($this->context[0], [self::CONTEXT_HTML_ATTRIBUTE, self::CONTEXT_HTML_TAG], TRUE)) {
+		if ($this->context === self::CONTEXT_HTML_TAG || Helpers::startsWith($this->context, self::CONTEXT_HTML_ATTRIBUTE)) {
 			$this->lastAttrValue = TRUE;
 		}
 
@@ -355,20 +362,20 @@ private function processHtmlTagBegin(Token $token)
 			}
 			$this->htmlNode->closing = TRUE;
 			$this->htmlNode->endLine = $this->getLine();
-			$this->setContext(NULL);
+			$this->context = self::CONTEXT_HTML_TEXT;
 
 		} elseif ($token->text === '<!--') {
-			$this->setContext(self::CONTEXT_HTML_COMMENT);
+			$this->context = self::CONTEXT_HTML_COMMENT;
 
 		} elseif ($token->text === '<?' || $token->text === '<!') {
-			$this->setContext(self::CONTEXT_HTML_BOGUS_COMMENT);
+			$this->context = self::CONTEXT_HTML_BOGUS_COMMENT;
 			$this->output .= $token->text === '<?' ? '<<?php ?>?' : '<!'; // bypass error in escape()
 			return;
 
 		} else {
 			$this->htmlNode = new HtmlNode($token->name, $this->htmlNode);
 			$this->htmlNode->startLine = $this->getLine();
-			$this->setContext(self::CONTEXT_HTML_TAG);
+			$this->context = self::CONTEXT_HTML_TAG;
 		}
 		$this->tagOffset = strlen($this->output);
 		$this->output .= $token->text;
@@ -377,9 +384,9 @@ private function processHtmlTagBegin(Token $token)
 
 	private function processHtmlTagEnd(Token $token)
 	{
-		if (in_array($this->context[0], [self::CONTEXT_HTML_COMMENT, self::CONTEXT_HTML_BOGUS_COMMENT], TRUE)) {
+		if (in_array($this->context, [self::CONTEXT_HTML_COMMENT, self::CONTEXT_HTML_BOGUS_COMMENT], TRUE)) {
 			$this->output .= $token->text;
-			$this->setContext(NULL);
+			$this->context = self::CONTEXT_HTML_TEXT;
 			return;
 		}
 
@@ -418,7 +425,7 @@ private function processHtmlTagEnd(Token $token)
 			}
 		}
 
-		$this->setContext(NULL);
+		$this->context = self::CONTEXT_HTML_TEXT;
 
 		if ($htmlNode->closing) {
 			$this->htmlNode = $this->htmlNode->parentNode;
@@ -426,7 +433,7 @@ private function processHtmlTagEnd(Token $token)
 		} elseif ((($lower = strtolower($htmlNode->name)) === 'script' || $lower === 'style')
 			&& (!isset($htmlNode->attrs['type']) || preg_match('#(java|j|ecma|live)script|json|css#i', $htmlNode->attrs['type']))
 		) {
-			$this->setContext($lower === 'script' ? self::CONTEXT_HTML_JS : self::CONTEXT_HTML_CSS);
+			$this->context = $lower === 'script' ? self::CONTEXT_HTML_JS : self::CONTEXT_HTML_CSS;
 		}
 	}
 
@@ -448,37 +455,34 @@ private function processHtmlAttributeBegin(Token $token)
 		$this->lastAttrValue = & $this->htmlNode->attrs[$token->name];
 		$this->output .= $this->escape($token->text);
 
-		$context = NULL;
 		$lower = strtolower($token->name);
 		if (in_array($token->value, ['"', "'"], TRUE)) {
 			$this->lastAttrValue = '';
-			$contextMain = self::CONTEXT_HTML_ATTRIBUTE;
+			$this->context = self::CONTEXT_HTML_ATTRIBUTE;
 			if (in_array($this->contentType, [self::CONTENT_HTML, self::CONTENT_XHTML], TRUE)) {
 				if (Helpers::startsWith($lower, 'on')) {
-					$context = self::CONTEXT_HTML_JS;
+					$this->context = self::CONTEXT_HTML_ATTRIBUTE_JS;
 				} elseif ($lower === 'style') {
-					$context = self::CONTEXT_HTML_CSS;
+					$this->context = self::CONTEXT_HTML_ATTRIBUTE_CSS;
 				}
 			}
 		} else {
 			$this->lastAttrValue = $token->value;
-			$contextMain = self::CONTEXT_HTML_TAG;
+			$this->context = self::CONTEXT_HTML_TAG;
 		}
 
 		if (in_array($this->contentType, [self::CONTENT_HTML, self::CONTENT_XHTML], TRUE)
 			&& (in_array($lower, ['href', 'src', 'action', 'formaction'], TRUE)
 				|| ($lower === 'data' && strtolower($this->htmlNode->name) === 'object'))
 		) {
-			$context = self::CONTEXT_HTML_ATTRIBUTE_URL;
+			$this->context = $this->context === self::CONTEXT_HTML_TAG ? self::CONTEXT_HTML_ATTRIBUTE_UNQUOTED_URL : self::CONTEXT_HTML_ATTRIBUTE_URL;
 		}
-
-		$this->setContext($contextMain, $context);
 	}
 
 
 	private function processHtmlAttributeEnd(Token $token)
 	{
-		$this->setContext(self::CONTEXT_HTML_TAG);
+		$this->context = self::CONTEXT_HTML_TAG;
 		$this->output .= $token->text;
 	}
 
@@ -728,7 +732,7 @@ public function writeAttrsMacro($html)
 	 */
 	public function expandMacro($name, $args, $modifiers = NULL, $nPrefix = NULL)
 	{
-		$inScript = in_array($this->context[0], [self::CONTEXT_HTML_JS, self::CONTEXT_HTML_CSS], TRUE);
+		$inScript = in_array($this->context, [self::CONTEXT_HTML_JS, self::CONTEXT_HTML_CSS], TRUE);
 
 		if (empty($this->macros[$name])) {
 			$hint = ($t = Helpers::getSuggestion(array_keys($this->macros), $name)) ? ", did you mean {{$t}}?" : '';
@@ -742,7 +746,7 @@ public function expandMacro($name, $args, $modifiers = NULL, $nPrefix = NULL)
 		}
 
 		if (strpbrk($name, '=~%^&_')) {
-			if ($this->context[1] === self::CONTEXT_HTML_ATTRIBUTE_URL) {
+			if (in_array($this->context, [self::CONTEXT_HTML_ATTRIBUTE_URL, self::CONTEXT_HTML_ATTRIBUTE_UNQUOTED_URL], TRUE)) {
 				if (!Helpers::removeFilter($modifiers, 'nosafeurl|nocheck') && !preg_match('#\|datastream(?=\s|\||\z)#i', $modifiers)) {
 					$modifiers .= '|checkurl';
 				}
@@ -757,13 +761,13 @@ public function expandMacro($name, $args, $modifiers = NULL, $nPrefix = NULL)
 		}
 
 		if ($nPrefix === MacroNode::PREFIX_INNER && !strcasecmp($this->htmlNode->name, 'script')) {
-			$context = [$this->contentType, self::CONTEXT_HTML_JS, NULL];
+			$context = [$this->contentType, self::CONTEXT_HTML_JS];
 		} elseif ($nPrefix === MacroNode::PREFIX_INNER && !strcasecmp($this->htmlNode->name, 'style')) {
-			$context = [$this->contentType, self::CONTEXT_HTML_CSS, NULL];
+			$context = [$this->contentType, self::CONTEXT_HTML_CSS];
 		} elseif ($nPrefix) {
-			$context = [$this->contentType, NULL, NULL];
+			$context = [$this->contentType, self::CONTEXT_HTML_TEXT];
 		} else {
-			$context = [$this->contentType, $this->context[0], $this->context[1]];
+			$context = [$this->contentType, $this->context];
 		}
 
 		foreach (array_reverse($this->macros[$name]) as $macro) {
diff --git a/src/Latte/Compiler/MacroNode.php b/src/Latte/Compiler/MacroNode.php
index a3d0bbe5e..3b753a109 100644
--- a/src/Latte/Compiler/MacroNode.php
+++ b/src/Latte/Compiler/MacroNode.php
@@ -70,7 +70,7 @@ class MacroNode
 	/** @var HtmlNode  closest HTML node */
 	public $htmlNode;
 
-	/** @var array [contentType, context, subcontext] */
+	/** @var array [contentType, context] */
 	public $context;
 
 	/** @var string  indicates n:attribute macro and type of prefix (PREFIX_INNER, PREFIX_TAG, PREFIX_NONE) */
diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
index 142ef10df..048f6ae97 100644
--- a/src/Latte/Compiler/PhpWriter.php
+++ b/src/Latte/Compiler/PhpWriter.php
@@ -433,7 +433,7 @@ public function modifierPass(MacroTokens $tokens, $var, $isContent = FALSE)
 				if ($tokens->isCurrent($tokens::T_SYMBOL)) {
 					if ($tokens->isCurrent('escape')) {
 						if ($isContent) {
-							$res->prepend('LR\Filters::convertTo($_fi, ' . var_export($this->context[0] . $this->context[1], TRUE) . ', ')
+							$res->prepend('LR\Filters::convertTo($_fi, ' . var_export(implode($this->context), TRUE) . ', ')
 								->append(')');
 						} else {
 							$res = $this->escapePass($res);
@@ -469,24 +469,23 @@ public function modifierPass(MacroTokens $tokens, $var, $isContent = FALSE)
 	public function escapePass(MacroTokens $tokens)
 	{
 		$tokens = clone $tokens;
-		list($contentType, $context, $subContext) = $this->context;
+		list($contentType, $context) = $this->context;
 		switch ($contentType) {
 			case Compiler::CONTENT_XHTML:
 			case Compiler::CONTENT_HTML:
 				switch ($context) {
-					case Compiler::CONTEXT_HTML_ATTRIBUTE:
+					case Compiler::CONTEXT_HTML_TEXT:
+						return $tokens->prepend('LR\Filters::escapeHtmlText(')->append(')');
 					case Compiler::CONTEXT_HTML_TAG:
-						if ($subContext === Compiler::CONTEXT_HTML_JS) {
-							$tokens->prepend('LR\Filters::escapeJs(')->append(')');
-						} elseif ($subContext === Compiler::CONTEXT_HTML_CSS) {
-							$tokens->prepend('LR\Filters::escapeCss(')->append(')');
-						}
-						if ($context === Compiler::CONTEXT_HTML_TAG) {
-							$tokens->prepend('LR\Filters::escapeHtmlAttrUnquoted(')->append(')');
-						} else {
-							$tokens->prepend('LR\Filters::escapeHtmlAttr(')->append(')');
-						}
-						return $tokens;
+					case Compiler::CONTEXT_HTML_ATTRIBUTE_UNQUOTED_URL:
+						return $tokens->prepend('LR\Filters::escapeHtmlAttrUnquoted(')->append(')');
+					case Compiler::CONTEXT_HTML_ATTRIBUTE:
+					case Compiler::CONTEXT_HTML_ATTRIBUTE_URL:
+						return $tokens->prepend('LR\Filters::escapeHtmlAttr(')->append(')');
+					case Compiler::CONTEXT_HTML_ATTRIBUTE_JS:
+						return $tokens->prepend('LR\Filters::escapeHtmlAttr(LR\Filters::escapeJs(')->append('))');
+					case Compiler::CONTEXT_HTML_ATTRIBUTE_CSS:
+						return $tokens->prepend('LR\Filters::escapeHtmlAttr(LR\Filters::escapeCss(')->append('))');
 					case Compiler::CONTEXT_HTML_COMMENT:
 						return $tokens->prepend('LR\Filters::escapeHtmlComment(')->append(')');
 					case Compiler::CONTEXT_HTML_BOGUS_COMMENT:
@@ -495,17 +494,21 @@ public function escapePass(MacroTokens $tokens)
 					case Compiler::CONTEXT_HTML_CSS:
 						return $tokens->prepend('LR\Filters::escape' . ucfirst($context) . '(')->append(')');
 					default:
-						return $tokens->prepend('LR\Filters::escapeHtmlText(')->append(')');
+						throw new CompileException("Unknown context $contentType, $context.");
 				}
 
 			case Compiler::CONTENT_XML:
 				switch ($context) {
+					case Compiler::CONTEXT_XML_TEXT:
+					case Compiler::CONTEXT_XML_ATTRIBUTE:
+					case Compiler::CONTEXT_XML_BOGUS_COMMENT:
+						return $tokens->prepend('LR\Filters::escapeXml(')->append(')');
 					case Compiler::CONTEXT_XML_COMMENT:
 						return $tokens->prepend('LR\Filters::escapeHtmlComment(')->append(')');
 					case Compiler::CONTEXT_XML_TAG:
 						return $tokens->prepend('LR\Filters::escapeXmlAttrUnquoted(')->append(')');
 					default:
-						return $tokens->prepend('LR\Filters::escapeXml(')->append(')');
+						throw new CompileException("Unknown context $contentType, $context.");
 				}
 
 			case Compiler::CONTENT_JS:
@@ -514,8 +517,10 @@ public function escapePass(MacroTokens $tokens)
 				return $tokens->prepend('LR\Filters::escape' . ucfirst($contentType) . '(')->append(')');
 			case Compiler::CONTENT_TEXT:
 				return $tokens;
-			default:
+			case NULL:
 				return $tokens->prepend('call_user_func($this->filters->escape, ')->append(')');
+			default:
+				throw new CompileException("Unknown context $contentType.");
 		}
 	}
 
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
index af843d08e..48d0f196d 100644
--- a/src/Latte/Macros/BlockMacros.php
+++ b/src/Latte/Macros/BlockMacros.php
@@ -128,7 +128,7 @@ public function macroInclude(MacroNode $node, PhpWriter $writer)
 			. (isset($this->namedBlocks[$destination]) || $parent ? 'get_defined_vars()' : '$this->params')
 			. ($node->modifiers
 				? ', function ($s, $type) { $_fi = new LR\FilterInfo($type); return %modifyContent($s); }'
-				: ($noEscape || $parent ? '' : ', ' . var_export($node->context[0] . $node->context[1], TRUE)))
+				: ($noEscape || $parent ? '' : ', ' . var_export(implode($node->context), TRUE)))
 			. ');'
 		);
 	}
@@ -147,7 +147,7 @@ public function macroIncludeBlock(MacroNode $node, PhpWriter $writer)
 		}
 		return $writer->write(
 			'ob_start(function () {}); $this->createTemplate(%node.word, %node.array? + get_defined_vars(), "includeblock")->renderToContentType(%var); echo rtrim(ob_get_clean());',
-			$node->context[0] . $node->context[1]
+			implode($node->context)
 		);
 	}
 
@@ -245,7 +245,7 @@ public function macroBlock(MacroNode $node, PhpWriter $writer)
 				$node->data->func = $this->generateMethodName($name);
 				$fname = $writer->formatWord($name);
 				$node->closingCode = '<?php ' . ($node->name === 'define' ? '' : "\$this->renderBlock($fname, get_defined_vars());") . ' ?>';
-				$blockType = var_export($node->context[0] . $node->context[1], TRUE);
+				$blockType = var_export(implode($node->context), TRUE);
 				$this->checkExtraArgs($node);
 				return "\$this->checkBlockContentType($blockType, $fname);"
 					. "\$this->blockQueue[$fname][] = [\$this, '{$node->data->func}'];";
@@ -269,13 +269,13 @@ public function macroBlock(MacroNode $node, PhpWriter $writer)
 		if (Helpers::removeFilter($node->modifiers, 'escape')) {
 			trigger_error('Macro ' . $node->getNotation() . ' provides auto-escaping, remove |escape.');
 		}
-		if ($node->context[1] === 'attr') {
-			$node->context[1] = NULL;
+		if (Helpers::startsWith($node->context[1], Latte\Compiler::CONTEXT_HTML_ATTRIBUTE)) {
+			$node->context[1] = '';
 			$node->modifiers .= '|escape';
 		} elseif ($node->modifiers) {
 			$node->modifiers .= '|escape';
 		}
-		$this->blockTypes[$name] = $node->context[0] . $node->context[1];
+		$this->blockTypes[$name] = implode($node->context);
 
 		$include = '$this->renderBlock(%var, ' . (($node->name === 'snippet' || $node->name === 'snippetArea') ? '$this->params' : 'get_defined_vars()')
 			. ($node->modifiers ? ', function ($s, $type) { $_fi = new LR\FilterInfo($type); return %modifyContent($s); }' : '') . ')';
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index 4dd58815b..9d8290267 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -236,7 +236,7 @@ public function macroInclude(MacroNode $node, PhpWriter $writer)
 			$this->createTemplate(%node.word, %node.array? + $this->params, "include")->renderToContentType(%raw);',
 			$node->modifiers
 				? $writer->write('function ($s, $type) { $_fi = new LR\FilterInfo($type); return %modifyContent($s); }')
-				: var_export($noEscape ? NULL : $node->context[0] . $node->context[1], TRUE)
+				: var_export($noEscape ? NULL : implode($node->context), TRUE)
 		);
 	}
 
diff --git a/src/Latte/Macros/MacroSet.php b/src/Latte/Macros/MacroSet.php
index 5449ab0ec..86d099035 100644
--- a/src/Latte/Macros/MacroSet.php
+++ b/src/Latte/Macros/MacroSet.php
@@ -101,7 +101,7 @@ public function nodeOpened(MacroNode $node)
 			} elseif (!$node->attrCode) {
 				$node->attrCode = "<?php $res ?>";
 			}
-			$node->context[1] = NULL;
+			$node->context[1] = Latte\Compiler::CONTEXT_HTML_TEXT;
 
 		} elseif ($begin) {
 			$res = $this->compile($node, $begin);
diff --git a/src/Latte/Runtime/Filters.php b/src/Latte/Runtime/Filters.php
index 3d3f7a089..c4e1b3a49 100644
--- a/src/Latte/Runtime/Filters.php
+++ b/src/Latte/Runtime/Filters.php
@@ -198,7 +198,7 @@ public static function escapeHtmlRawText($s)
 	 */
 	public static function stripHtml(FilterInfo $info, $s)
 	{
-		if (!in_array($info->contentType, [NULL, 'html', 'xhtml', 'htmlattr', 'xhtmlattr', 'xml', 'xmlattr'], TRUE)) {
+		if (!in_array($info->contentType, [NULL, 'html', 'xhtml', 'htmlAttr', 'xhtmlAttr', 'xml', 'xmlAttr'], TRUE)) {
 			trigger_error("Filter |stripHtml used with incompatible type " . strtoupper($info->contentType), E_USER_WARNING);
 		}
 		$info->contentType = Engine::CONTENT_TEXT;
@@ -214,7 +214,7 @@ public static function stripHtml(FilterInfo $info, $s)
 	 */
 	public static function stripTags(FilterInfo $info, $s)
 	{
-		if (!in_array($info->contentType, [NULL, 'html', 'xhtml', 'htmlattr', 'xhtmlattr', 'xml', 'xmlattr'], TRUE)) {
+		if (!in_array($info->contentType, [NULL, 'html', 'xhtml', 'htmlAttr', 'xhtmlAttr', 'xml', 'xmlAttr'], TRUE)) {
 			trigger_error("Filter |stripTags used with incompatible type " . strtoupper($info->contentType), E_USER_WARNING);
 		}
 		return strip_tags($s);
@@ -246,11 +246,38 @@ public static function convertTo(FilterInfo $info, $dest, $s)
 	public static function getConvertor($source, $dest)
 	{
 		static $table = [
-			Engine::CONTENT_TEXT => ['html' => 'escapeHtmlText', 'xhtml' => 'escapeHtmlText', 'htmlattr' => 'escapeHtmlAttr', 'xhtmlattr' => 'escapeHtmlAttr', 'xml' => 'escapeXml', 'xmlattr' => 'escapeXml'],
-			Engine::CONTENT_JS => ['html' => 'escapeHtmlText', 'xhtml' => 'escapeHtmlText', 'htmlattr' => 'escapeHtmlAttr', 'xhtmlattr' => 'escapeHtmlAttr', 'htmljs' => 'escapeHtmlRawText'],
-			Engine::CONTENT_CSS => ['html' => 'escapeHtmlText', 'xhtml' => 'escapeHtmlText', 'htmlattr' => 'escapeHtmlAttr', 'xhtmlattr' => 'escapeHtmlAttr', 'htmlcss' => 'escapeHtmlRawText'],
-			Engine::CONTENT_HTML => ['htmlattr' => 'escapeHtmlAttrConv'],
-			Engine::CONTENT_XHTML => ['xhtmlattr' => 'escapeHtmlAttrConv'],
+			Engine::CONTENT_TEXT => [
+				'html' => 'escapeHtmlText', 'xhtml' => 'escapeHtmlText',
+				'htmlAttr' => 'escapeHtmlAttr', 'xhtmlAttr' => 'escapeHtmlAttr',
+				'htmlAttrJs' => 'escapeHtmlAttr', 'xhtmlAttrJs' => 'escapeHtmlAttr',
+				'htmlAttrCss' => 'escapeHtmlAttr', 'xhtmlAttrCss' => 'escapeHtmlAttr',
+				'htmlAttrUrl' => 'escapeHtmlAttr', 'xhtmlAttrUrl' => 'escapeHtmlAttr',
+				'xml' => 'escapeXml', 'xmlAttr' => 'escapeXml',
+			],
+			Engine::CONTENT_JS => [
+				'html' => 'escapeHtmlText', 'xhtml' => 'escapeHtmlText',
+				'htmlAttr' => 'escapeHtmlAttr', 'xhtmlAttr' => 'escapeHtmlAttr',
+				'htmlAttrJs' => 'escapeHtmlAttr', 'xhtmlAttrJs' => 'escapeHtmlAttr',
+				'htmlJs' => 'escapeHtmlRawText', 'xhtmlJs' => 'escapeHtmlRawText',
+			],
+			Engine::CONTENT_CSS => [
+				'html' => 'escapeHtmlText', 'xhtml' => 'escapeHtmlText',
+				'htmlAttr' => 'escapeHtmlAttr', 'xhtmlAttr' => 'escapeHtmlAttr',
+				'htmlAttrCss' => 'escapeHtmlAttr', 'xhtmlAttrCss' => 'escapeHtmlAttr',
+				'htmlCss' => 'escapeHtmlRawText', 'xhtmlCss' => 'escapeHtmlRawText',
+			],
+			Engine::CONTENT_HTML => [
+				'htmlAttr' => 'escapeHtmlAttrConv',
+				'htmlAttrJs' => 'escapeHtmlAttrConv',
+				'htmlAttrCss' => 'escapeHtmlAttrConv',
+				'htmlAttrUrl' => 'escapeHtmlAttrConv',
+			],
+			Engine::CONTENT_XHTML => [
+				'xhtmlAttr' => 'escapeHtmlAttrConv',
+				'xhtmlAttrJs' => 'escapeHtmlAttrConv',
+				'xhtmlAttrCss' => 'escapeHtmlAttrConv',
+				'xhtmlAttrUrl' => 'escapeHtmlAttrConv',
+			],
 		];
 		return isset($table[$source][$dest]) ? [__CLASS__, $table[$source][$dest]] : NULL;
 	}