Index: branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r6897 -r6907
--- branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6897)
+++ branches/unlabeled/unlabeled-1.79.4/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6907)
@@ -703,16 +703,15 @@
 		{
 			$object =& $event->getObject();
 
-			$main_wid = $this->Application->GetTopmostWid($event->Prefix);
-			if ($main_wid) $main_wid = '_'.$main_wid;
+			$edit_mark = rtrim($this->Application->GetSID().'_'.$this->Application->GetTopmostWid($event->Prefix), '_');
 			
 			// add search filter
 			$filter_data = $this->Application->RecallVar($event->getPrefixSpecial().'_search_filter');
 			if ($filter_data) {
 				$filter_data = unserialize($filter_data);
 				foreach ($filter_data as $filter_field => $filter_params) {
 					$filter_type = ($filter_params['type'] == 'having') ? HAVING_FILTER : WHERE_FILTER;
-					$filter_value = str_replace(WID_MARK, $main_wid, $filter_params['value']);
+					$filter_value = str_replace(EDIT_MARK, $edit_mark, $filter_params['value']);
 					$object->addFilter($filter_field, $filter_value, $filter_type, FLT_SEARCH);
 				}
 			}
@@ -728,7 +727,7 @@
 						list ($filter_type, $field_options) = each($field_options);
 						if ($field_options['value']) {
 							$filter_type = ($field_options['sql_filter_type'] == 'having') ? HAVING_FILTER : WHERE_FILTER;
-							$filter_value = str_replace(WID_MARK, $main_wid, $field_options['value']);
+							$filter_value = str_replace(EDIT_MARK, $edit_mark, $field_options['value']);
 							$object->addFilter($field_name, $filter_value, $filter_type, FLT_CUSTOM);
 						}
 					}
Index: branches/unlabeled/unlabeled-1.3.4/core/kernel/constants.php
===================================================================
diff -u -r6897 -r6907
--- branches/unlabeled/unlabeled-1.3.4/core/kernel/constants.php	(.../constants.php)	(revision 6897)
+++ branches/unlabeled/unlabeled-1.3.4/core/kernel/constants.php	(.../constants.php)	(revision 6907)
@@ -35,7 +35,7 @@
 	define('ptCATEGORY', 	0);
 	define('ptSYSTEM', 		1);
 
-	define('WID_MARK', '&|wid|&'); // replace this sequence inside filters to _main_wid
+	define('EDIT_MARK', '&|edit|&'); // replace this sequence inside filters to SID[_main_wid]
 	
 	$application =& kApplication::Instance();
 	$spacer_url = $application->BaseURL().'core/admin_templates/img/spacer.gif';
Index: branches/unlabeled/unlabeled-1.4.2/core/units/general/helpers/search_helper.php
===================================================================
diff -u -r6897 -r6907
--- branches/unlabeled/unlabeled-1.4.2/core/units/general/helpers/search_helper.php	(.../search_helper.php)	(revision 6897)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/general/helpers/search_helper.php	(.../search_helper.php)	(revision 6907)
@@ -107,7 +107,7 @@
 			// replace wid inside table name to WID_MARK constant value
 			$is_temp_table = preg_match('/(.*)'.TABLE_PREFIX.'ses_'.$this->Application->GetSID().'(_[\d]+){0,1}_edit_(.*)/', $table_name, $regs);
 			if ($is_temp_table) {
-				$table_name = $regs[1].TABLE_PREFIX.'ses_'.$this->Application->GetSID().($regs[2] ? WID_MARK : '').'_edit_'.$regs[3];
+				$table_name = $regs[1].TABLE_PREFIX.'ses_'.EDIT_MARK.'_edit_'.$regs[3]; // edit_mark will be replaced with sid[_main_wid] in AddFilters
 			}
 			
 			return Array ('field_name' => $field_name, 'field_type' => $field_type, 'table_name' => $table_name, 'sql_filter_type' => $sql_filter_type);