Index: branches/unlabeled/unlabeled-1.42.2/kernel/units/general/cat_event_handler.php
===================================================================
diff -u -r4396 -r4462
--- branches/unlabeled/unlabeled-1.42.2/kernel/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4396)
+++ branches/unlabeled/unlabeled-1.42.2/kernel/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4462)
@@ -611,11 +611,7 @@
 		$event->redirect = false;
 		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-		$keywords = trim($this->Application->GetVar('keywords'));
-		if( !$this->Application->GetVar('INPORTAL_ON') )
-		{
-			$keywords = unhtmlentities($keywords);
-		}
+		$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
 
 		$query_object =& $this->Application->recallObject('HTTPQuery');
 		$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -938,10 +934,7 @@
 			switch($record['FieldType'])
 			{
 				case 'text':
-					if( !$this->Application->GetVar('INPORTAL_ON') )
-					{
 					$keywords[$field] = unhtmlentities( $keywords[$field] );
-					}
 
 					if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
 					{
Index: branches/unlabeled/unlabeled-1.42.2/core/units/general/cat_event_handler.php
===================================================================
diff -u -r4396 -r4462
--- branches/unlabeled/unlabeled-1.42.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4396)
+++ branches/unlabeled/unlabeled-1.42.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4462)
@@ -611,11 +611,7 @@
 		$event->redirect = false;
 		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-		$keywords = trim($this->Application->GetVar('keywords'));
-		if( !$this->Application->GetVar('INPORTAL_ON') )
-		{
-			$keywords = unhtmlentities($keywords);
-		}
+		$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
 
 		$query_object =& $this->Application->recallObject('HTTPQuery');
 		$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -938,10 +934,7 @@
 			switch($record['FieldType'])
 			{
 				case 'text':
-					if( !$this->Application->GetVar('INPORTAL_ON') )
-					{
 					$keywords[$field] = unhtmlentities( $keywords[$field] );
-					}
 
 					if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
 					{
Index: branches/unlabeled/unlabeled-1.108.2/kernel/action.php
===================================================================
diff -u -r4438 -r4462
--- branches/unlabeled/unlabeled-1.108.2/kernel/action.php	(.../action.php)	(revision 4438)
+++ branches/unlabeled/unlabeled-1.108.2/kernel/action.php	(.../action.php)	(revision 4462)
@@ -2328,7 +2328,7 @@
 	        $rs->MoveNext();
 	    }
 
-	    if($_REQUEST['CategoryId'] > 0) // not root category is updated
+	    if(($_REQUEST['CategoryId'] > 0) || ($Action == 'm_add_category')) // not root category is updated
 	    {
 		    $cat_ids = $objCatList->CopyFromEditTable("CategoryId");
 		    if ($cat_ids) {