Index: trunk/core/units/general/main_event_handler.php
===================================================================
diff -u -r4971 -r6093
--- trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 4971)
+++ trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 6093)
@@ -55,7 +55,7 @@
 
 			$ret = '';
 			$default_language_id = $this->Application->GetDefaultLanguageId();
-			if( $processed_params['m_lang'] != $default_language_id )
+			if( $processed_params['m_lang'] && ($processed_params['m_lang'] != $default_language_id) )
 			{
 				$language_name = $this->Application->getCache('language_names', $processed_params['m_lang']);
 				if ($language_name === false) {
@@ -69,7 +69,7 @@
 			}
 
 			$default_theme_id = $this->Application->GetDefaultThemeId();
-			if( $processed_params['m_theme'] != $default_theme_id )
+			if( $processed_params['m_theme'] && ($processed_params['m_theme'] != $default_theme_id) )
 			{
 				$theme_name = $this->Application->getCache('theme_names', $processed_params['m_theme']);
 				if ($theme_name === false) {
@@ -85,6 +85,7 @@
 
 			if ($processed_params['m_cat_id'] > 0) {
 				$ret .= $this->Application->getFilename('c', $processed_params['m_cat_id']).'/';
+				$url_params['category_processed'] = true;
 			}
 
 			$force_page_adding = false;