Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r16339 -r16348
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: application.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1078,17 +1078,26 @@
 	}
 
 	/**
-	 * Only renders template
+	 * Replaces current rendered template with given one.
 	 *
-	 * @see kDBEventHandler::_errorNotFound()
+	 * @param string|null $template Template.
+	 *
+	 * @return void
 	 */
-	public function QuickRun()
+	public function QuickRun($template)
 	{
-		// Replace current page content with 404.
-		$this->InitParser();
+		/** @var kThemesHelper $themes_helper */
+		$themes_helper = $this->recallObject('ThemesHelper');
 
+		// Set Web Request variables to affect link building on template itself.
+		$this->SetVar('t', $template);
+		$this->SetVar('m_cat_id', $themes_helper->getPageByTemplate($template));
+		$this->SetVar('passed', 'm');
+
+		// Replace current page content with given template.
+		$this->InitParser();
 		$this->Parser->Clear();
-		$this->HTML = $this->Parser->Run($this->GetVar('t'));
+		$this->HTML = $this->Parser->Run($template);
 	}
 
 	/**
Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r16313 -r16348
--- branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 16313)
+++ branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 16313 2016-01-17 12:14:51Z alex $
+* @version	$Id: categories_event_handler.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1766,17 +1766,7 @@
 				}
 			}
 			else {
-				$not_found = $this->Application->ConfigValue('ErrorTemplate');
-				$real_t = $not_found ? $not_found : 'error_notfound';
-
-				$themes_helper = $this->Application->recallObject('ThemesHelper');
-				/* @var $themes_helper kThemesHelper */
-
-				$theme_id = $this->Application->GetVar('m_theme');
-				$category_id = $themes_helper->getPageByTemplate($real_t, $theme_id);
-				$this->Application->SetVar('m_cat_id', $category_id);
-
-				header('HTTP/1.0 404 Not Found');
+				$this->Application->UrlManager->show404();
 			}
 
 			// replace alias in form #alias_name# to actual template used in this theme
Index: branches/5.2.x/core/kernel/managers/rewrite_url_processor.php
===================================================================
diff -u -N -r16339 -r16348
--- branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: rewrite_url_processor.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: rewrite_url_processor.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -152,6 +152,9 @@
 				// don't cache 404 Not Found
 				$this->_setCachedUrl($url, Array ('vars' => $vars, 'passed' => $passed));
 			}
+			else {
+				header('HTTP/1.0 404 Not Found');
+			}
 
 			if ( $this->Application->GetVarDirect('t', 'Post') ) {
 				// template from POST overrides template from URL.
@@ -445,7 +448,13 @@
 		}
 
 		if ( $this->_partsToParse ) {
-			$vars = array_merge($vars, $this->manager->prepare404($vars['m_theme']));
+			/** @var kThemesHelper $themes_helper */
+			$themes_helper = $this->Application->recallObject('ThemesHelper');
+
+			$not_found = $this->Application->ConfigValue('ErrorTemplate');
+			$vars['t'] = $not_found ? $not_found : 'error_notfound';
+			$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $vars['m_theme']);
+			$vars['pass'] = array('m');
 		}
 
 		return $vars;
@@ -1078,4 +1087,4 @@
 
 		return $ret;
 	}
-}
\ No newline at end of file
+}
Index: branches/5.2.x/core/kernel/managers/url_manager.php
===================================================================
diff -u -N -r16339 -r16348
--- branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: url_manager.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: url_manager.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -452,47 +452,20 @@
 	}
 
 	/**
-	 * Prepares case, when requested page wasn't found
-	 *
-	 * @param int $theme_id
-	 * @return array
-	 */
-	public function prepare404($theme_id = null)
-	{
-		if ( !isset($theme_id) ) {
-			$theme_id = $this->Application->GetVar('m_theme');
-		}
-
-		$not_found = $this->Application->ConfigValue('ErrorTemplate');
-		$vars['t'] = $not_found ? $not_found : 'error_notfound';
-
-		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
-
-		$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $theme_id);
-
-		header('HTTP/1.0 404 Not Found');
-
-		return $vars;
-	}
-
-	/**
 	 * Show 404 page and exit
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function show404()
 	{
-		$vars = $this->prepare404();
+		header('HTTP/1.0 404 Not Found');
 
-		foreach ($vars as $var_name => $var_value) {
-			$this->Application->SetVar($var_name, $var_value);
-		}
+		$not_found = $this->Application->ConfigValue('ErrorTemplate');
+		$template = $not_found ? $not_found : 'error_notfound';
 
-		// ensure parser is available (e.g. 404 page requested from event)
-		$this->Application->QuickRun();
+		$this->Application->QuickRun($template);
 		$this->Application->Done();
 		exit;
 	}
-}
\ No newline at end of file
+}
Index: branches/5.2.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -N -r16270 -r16348
--- branches/5.2.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 16270)
+++ branches/5.2.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser.php 16270 2015-09-27 09:55:42Z alex $
+* @version	$Id: nparser.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -142,9 +142,13 @@
 
 	function Clear()
 	{
-		// Discard any half-parsed content.
-		ob_clean();
+		// Discard any half-parsed content (e.g. from nested RenderElements).
+		$keep_buffering_levels = kUtil::constOn('SKIP_OUT_COMPRESSION') ? 1 : 2;
 
+		while ( ob_get_level() > $keep_buffering_levels ) {
+			ob_end_clean();
+		}
+
 		$this->Stack = array();
 		$this->Level = 0;