Index: branches/5.1.x/core/units/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r14350 -r14388
--- branches/5.1.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 14350)
+++ branches/5.1.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 14388)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mod_rewrite_helper.php 14350 2011-05-23 08:06:25Z alex $
+* @version	$Id: mod_rewrite_helper.php 14388 2011-06-27 07:07:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -514,9 +514,9 @@
 				$template = 'index';
 			}
 
-			// remove template from url if it is category index cached template
-			if (($template == $category_template) || (mb_strtolower($template) == '__default__')) {
-				// given template is also default template for this category or '__default__' given
+			// remove template from url if it is category index cached template OR site homepage
+			if (($template == $category_template) || (mb_strtolower($template) == '__default__') || ($template == 'index')) {
+				// given template is also default template for this category OR '__default__' given OR site homepage
 				$params['pass_template'] = false;
 			}
 
Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -N -r14361 -r14388
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 14361)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 14388)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 14361 2011-06-01 07:53:03Z alex $
+* @version	$Id: application.php 14388 2011-06-27 07:07:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1914,12 +1914,17 @@
 			// remove tempporary parameters used by listeners
 			unset($params['t'], $params['inject_parts'], $params['pass_template'], $params['pass_category'], $params['category_processed']);
 
-			if (array_key_exists('url_ending', $params)) {
-				$ret = trim($ret, '/') . $params['url_ending'];
+			$ret = trim($ret, '/');
+
+			if ( isset($params['url_ending']) ) {
+				if ($ret) {
+					$ret .= $params['url_ending'];
+				}
+
 				unset($params['url_ending']);
 			}
-			else {
-				$ret = trim($ret, '/') . MOD_REWRITE_URL_ENDING;
+			elseif ($ret) {
+				$ret .= MOD_REWRITE_URL_ENDING;
 			}
 
 			if ($env) {