Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/tree.js
===================================================================
diff -u -r7100 -r7370
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/tree.js	(.../tree.js)	(revision 7100)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/tree.js	(.../tree.js)	(revision 7370)
@@ -10,6 +10,7 @@
 	this.Level = 0;
 	this.Icon = icon;
 	this.Onclick = onclick;
+	this.Children = false;
 }
 
 TreeItem.prototype.Render = function(before, force)
@@ -161,9 +162,15 @@
 TreeItem.prototype.highLight = function()
 {
 	if (last_hightlighted) last_hightlighted.Tr.className = '';
+	if (this.Children && this.Children.length > 0 && this.Children[0].Url.replace('&', '&') == this.Url.replace('&', '&')) {
+		this.Children[0].highLight();
+		return;
+	}
+
 	this.Tr.className = "highlighted";
 	last_hightlighted = this;
 	last_highlighted_key = this.Key;
+	this.expand();
 }
 
 TreeItem.prototype.expand = function() { this.display() }
@@ -482,6 +489,7 @@
 
 TreeFolder.prototype.expand = function(mode)
 {
+	if (this.Expanding) return;
 	this.Expanding = true;
 
 	if (!isset(mode)) mode = 0;
Index: branches/unlabeled/unlabeled-1.8.2/core/units/categories/cache_updater.php
===================================================================
diff -u -r7089 -r7370
--- branches/unlabeled/unlabeled-1.8.2/core/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 7089)
+++ branches/unlabeled/unlabeled-1.8.2/core/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 7370)
@@ -404,6 +404,7 @@
 	 */
 	function OneStepRun($path='')
 	{
+		$this->InitUpdater();
 		$needs_more = true;
 		while ($needs_more) {
 			// until proceeeded in this step category count exceeds category per step limit
Index: branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php
===================================================================
diff -u -r7354 -r7370
--- branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 7354)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 7370)
@@ -4,16 +4,16 @@
 	{
 		function Create($force_id=false, $system_create=false)
 		{
+			$this->checkFilename();
+			$this->generateFilename();
+
 			if (!$this->Validate()) return false;
 
 			$this->SetDBField('ResourceId', $this->Application->NextResourceId());
 			$this->SetDBField('CreatedById', $this->Application->RecallVar('user_id') );
 			$this->SetDBField('CreatedOn_date', adodb_mktime() );
 			$this->SetDBField('CreatedOn_time', adodb_mktime() );
 
-			$this->checkFilename();
-			$this->generateFilename();
-
 			$parent_category = $this->GetDBField('ParentId') > 0 ? $this->GetDBField('ParentId') : $this->Application->GetVar('m_cat_id');
 			$this->SetDBField('ParentId', $parent_category);
 
Index: branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r7060 -r7370
--- branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 7060)
+++ branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 7370)
@@ -326,6 +326,7 @@
 		if ($parent_path) {
 			$cache_updater =& $this->Application->recallObject('kPermCacheUpdater', null, array('strict_path' => $parent_path));
 			$cache_updater->OneStepRun();
+			$cache_updater->StrictPath = false;
 		}
 	}