Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r4216 -r4225
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 4216)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 4225)
@@ -1121,10 +1121,6 @@
 	 */
 	function SectionTitle($params)
 	{
-		// save theese variables to session, because they are useful for most configuration templates
-		$this->Application->LinkVar('module');
-		$this->Application->LinkVar('section');
-		
 		$preset_name = replaceModuleSection($params['title_preset']);
 		$title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets');
 		$title_info = getArrayValue($title_presets, $preset_name);
Index: trunk/kernel/units/general/helpers/search_helper.php
===================================================================
diff -u -N
--- trunk/kernel/units/general/helpers/search_helper.php	(revision 0)
+++ trunk/kernel/units/general/helpers/search_helper.php	(revision 4225)
@@ -0,0 +1,28 @@
+<?php
+
+	class kSearchHelper extends kHelper {
+	
+		
+		/**
+		 * Splits search phrase into keyword using quotes,plus and minus sings and spaces as split criteria
+		 *
+		 * @param string $keyword
+		 * @return string
+		 */
+		function splitKeyword($keyword)
+		{
+			$quotes_re = '/([+\-]?)"(.*?)"/';
+			$no_qutes_re = '/([+\-]?)([^ ]+)/';
+			
+			$quoted_kw = preg_match_all($quotes_re, $keyword, $res);
+			foreach ($res[2] as $index => $kw) $final[$kw] = $res[1][$index];
+			$keyword = preg_replace($quotes_re, '', $keyword);
+			$not_quoted_kw =  preg_match_all($no_qutes_re, $keyword, $res);
+			foreach ($res[2] as $index => $kw) $final[$kw] = $res[1][$index];
+			
+			return $final;
+		}
+		
+	}
+
+?>
\ No newline at end of file
Index: trunk/core/units/general/helpers/search_helper.php
===================================================================
diff -u -N
--- trunk/core/units/general/helpers/search_helper.php	(revision 0)
+++ trunk/core/units/general/helpers/search_helper.php	(revision 4225)
@@ -0,0 +1,28 @@
+<?php
+
+	class kSearchHelper extends kHelper {
+	
+		
+		/**
+		 * Splits search phrase into keyword using quotes,plus and minus sings and spaces as split criteria
+		 *
+		 * @param string $keyword
+		 * @return string
+		 */
+		function splitKeyword($keyword)
+		{
+			$quotes_re = '/([+\-]?)"(.*?)"/';
+			$no_qutes_re = '/([+\-]?)([^ ]+)/';
+			
+			$quoted_kw = preg_match_all($quotes_re, $keyword, $res);
+			foreach ($res[2] as $index => $kw) $final[$kw] = $res[1][$index];
+			$keyword = preg_replace($quotes_re, '', $keyword);
+			$not_quoted_kw =  preg_match_all($no_qutes_re, $keyword, $res);
+			foreach ($res[2] as $index => $kw) $final[$kw] = $res[1][$index];
+			
+			return $final;
+		}
+		
+	}
+
+?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r3379 -r4225
--- trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 3379)
+++ trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 4225)
@@ -46,4 +46,6 @@
 <inp2:m_ParseBlock name="kernel_form"/>
 <inp2:m_if prefix="m" function="IsDebugMode"/>
 <a href="javascript:self.location.reload()">Reload frame</a>&nbsp;||&nbsp;<a href="javascript:toggleDebugLayer()">Show debugger</a>
-<inp2:m_endif/>
\ No newline at end of file
+<inp2:m_endif/>
+
+<inp2:m_StoreSystemVars />
\ No newline at end of file
Index: trunk/kernel/units/configuration/configuration_tag_processor.php
===================================================================
diff -u -N -r4052 -r4225
--- trunk/kernel/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4052)
+++ trunk/kernel/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4225)
@@ -27,7 +27,8 @@
 		$prev_heading = '';
 		$next_block = $params['full_block'];
 		$this->groupRecords($list->Records, 'heading');
-		
+		$field_values = $this->Application->GetVar($this->getPrefixSpecial(true));
+				
 		while (!$list->EOL())
 		{
 			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
@@ -47,6 +48,12 @@
 			$block_params['name'] = $curr_block;
 			
 			$block_params['show_heading'] = ($prev_heading != $list->GetDBField('heading') ) ? 1 : 0;
+			
+			// set values from submit if any
+			if ($field_values) {
+				$list->SetDBField('VariableValue', $field_values[$list->GetDBField('VariableName')]['VariableValue']);
+			}
+			
 			$o.= $this->Application->ParseBlock($block_params, 1);
 			$prev_heading = $list->GetDBField('heading');
 			$list->GoNext();
@@ -119,8 +126,7 @@
 		}
 				
 		return $msg;
-	}	
-	
+	}
 }
 
 ?>
\ No newline at end of file
Index: trunk/core/units/configuration/configuration_tag_processor.php
===================================================================
diff -u -N -r4052 -r4225
--- trunk/core/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4052)
+++ trunk/core/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 4225)
@@ -27,7 +27,8 @@
 		$prev_heading = '';
 		$next_block = $params['full_block'];
 		$this->groupRecords($list->Records, 'heading');
-		
+		$field_values = $this->Application->GetVar($this->getPrefixSpecial(true));
+				
 		while (!$list->EOL())
 		{
 			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
@@ -47,6 +48,12 @@
 			$block_params['name'] = $curr_block;
 			
 			$block_params['show_heading'] = ($prev_heading != $list->GetDBField('heading') ) ? 1 : 0;
+			
+			// set values from submit if any
+			if ($field_values) {
+				$list->SetDBField('VariableValue', $field_values[$list->GetDBField('VariableName')]['VariableValue']);
+			}
+			
 			$o.= $this->Application->ParseBlock($block_params, 1);
 			$prev_heading = $list->GetDBField('heading');
 			$list->GoNext();
@@ -119,8 +126,7 @@
 		}
 				
 		return $msg;
-	}	
-	
+	}
 }
 
 ?>
\ No newline at end of file
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r4216 -r4225
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4216)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4225)
@@ -851,6 +851,13 @@
 	{
 		return replaceModuleSection($params['icon']);
 	}
+	
+	function StoreSystemVars($params)
+	{
+		// save theese variables to session, because they are useful for most configuration templates
+		$this->Application->LinkVar('module');
+		$this->Application->LinkVar('section');
+	}
 }