Index: trunk/kernel/admin_templates/incs/tree.js
===================================================================
diff -u -N -r4724 -r4735
--- trunk/kernel/admin_templates/incs/tree.js	(.../tree.js)	(revision 4724)
+++ trunk/kernel/admin_templates/incs/tree.js	(.../tree.js)	(revision 4735)
@@ -98,15 +98,18 @@
 					}
 					return res;
 				}
-
-				if (!this.treeItem.Expanded && typeof(this.treeItem.folderClick) == 'function') {
-					if (this.treeItem.folderClick());
+				else {
+					// ensures, that click is made before AJAX request will be sent
+					window.parent.getFrame(link.target).location.href = this.href;
+					
+					if (!this.treeItem.Expanded && typeof(this.treeItem.folderClick) == 'function') {
+						if (this.treeItem.folderClick());
+					}
+					return false;				
 				}
 			}
-	//	)
 
-	td.appendChild( link );
-//	td.appendChild( document.createTextNode(this.Title) );
+	td.appendChild(link);
 }
 
 TreeItem.prototype.display = function()
Index: trunk/core/kernel/globals.php
===================================================================
diff -u -N -r4702 -r4735
--- trunk/core/kernel/globals.php	(.../globals.php)	(revision 4702)
+++ trunk/core/kernel/globals.php	(.../globals.php)	(revision 4735)
@@ -478,12 +478,8 @@
 		$module_section = $application->RecallVar('section');
 		if ($module_section) {
 			// substitute section instead of #section# parameter in title preset name
-			if (strpos($module_section, ':') === false) {
-				return $string;
-			}
-			
 			$module_section = explode(':', $module_section);
-			$section = preg_replace('/(configuration|configure)_(.*)/i', '\\2', $module_section[1]);
+			$section = preg_replace('/(configuration|configure)_(.*)/i', '\\2', $module_section[count($module_section) == 2 ? 1 : 0]);
 			$string = str_replace('#section#', strtolower($section), $string);
 		}
 		return $string;
Index: trunk/kernel/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r4710 -r4735
--- trunk/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4710)
+++ trunk/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4735)
@@ -231,6 +231,7 @@
 					$params['section_name'] = $section_name;
 					$section_data =& $sections_helper->getSectionData($section_name);
 					$section_data['label'] = $folder_label; // use folder label in tree
+					$section_data['is_tab'] = 1;
 				}
 				elseif (!$this->Application->CheckPermission($section_name.'.view', 1)) {
 					continue;
Index: trunk/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r4710 -r4735
--- trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4710)
+++ trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 4735)
@@ -231,6 +231,7 @@
 					$params['section_name'] = $section_name;
 					$section_data =& $sections_helper->getSectionData($section_name);
 					$section_data['label'] = $folder_label; // use folder label in tree
+					$section_data['is_tab'] = 1;
 				}
 				elseif (!$this->Application->CheckPermission($section_name.'.view', 1)) {
 					continue;
Index: trunk/kernel/admin_templates/sections_list.tpl
===================================================================
diff -u -N -r4702 -r4735
--- trunk/kernel/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 4702)
+++ trunk/kernel/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 4735)
@@ -34,7 +34,11 @@
 						</td>
 						<td class="subitem_description">
 							<a href="<inp2:m_param name="section_url"/>" class="dLink" title="<inp2:m_phrase name="$label"/>" target="main"><inp2:m_phrase name="$label"/></a>
-							<inp2:m_phrase name="la_Description_{$section_name}"/>
+							<inp2:m_if check="m_ParamEquals" name="is_tab" value="1">
+								<inp2:m_phrase name="la_Description_{$parent}"/>
+							<inp2:m_else/>
+								<inp2:m_phrase name="la_Description_{$section_name}"/>
+							</inp2:m_if>
 						</td>
 					</tr>
 				</inp2:m_DefineElement>