Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql
+++ core/install/upgrades.sql
@@ -2940,3 +2940,5 @@
 UPDATE Modules
 SET ClassNamespace = 'InPortal\\Core'
 WHERE `Name` IN ('Core', 'In-Portal');
+
+DELETE FROM CachedUrls;
Index: core/kernel/utility/http_query.php
===================================================================
--- core/kernel/utility/http_query.php
+++ core/kernel/utility/http_query.php
@@ -373,6 +373,16 @@
 				trigger_error('Non mod-rewrite url "<strong>' . $_SERVER['REQUEST_URI'] . '</strong>" used', E_USER_NOTICE);
 				$this->Application->Redirect('', $url_params);
 			}
+
+			if ( $this->Application->GetVar('is_friendly_url') ) {
+				$url_params = $this->getRedirectParams();
+
+				// No idea about how to check, that given template
+				// require category to be passed with it, so pass anyway.
+				$url_params['pass_category'] = 1;
+
+				$this->Application->Redirect('', $url_params);
+			}
 		}
 		else {
 			$this->Application->VerifyThemeId();
Index: core/units/categories/categories_event_handler.php
===================================================================
--- core/units/categories/categories_event_handler.php
+++ core/units/categories/categories_event_handler.php
@@ -3026,7 +3026,8 @@
 			/** @var kRewriteUrlProcessor $rewrite_processor */
 			$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
 
-			if ($friendly) {
+			if ( $friendly ) {
+				$vars['is_friendly_url'] = true;
 				$vars['m_cat_id'] = $friendly['CategoryId'];
 				$vars['t'] = preg_replace('/^Content\//i', '', $friendly['NamedParentPath']);