Index: trunk/kernel/admin_templates/incs/ajax.js
===================================================================
diff -u -N -r5030 -r5031
--- trunk/kernel/admin_templates/incs/ajax.js	(.../ajax.js)	(revision 5030)
+++ trunk/kernel/admin_templates/incs/ajax.js	(.../ajax.js)	(revision 5031)
@@ -58,7 +58,7 @@
 }
 
 Request.getProgressHtml = function() {
-	return "<p class='progress'>" + _progressText + "<br /><img src='img/ajax_progress.gif' align='absmiddle' width='100' height='7' alt='" + _progressText + "'/></p>";
+	return "<p class='progress'>" + Request.progressText + "<br /><img src='img/ajax_progress.gif' align='absmiddle' width='100' height='7' alt='" + Request.progressText + "'/></p>";
 }
 
 Request.getErrorHtml = function(p_req) {
Index: trunk/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r5030 -r5031
--- trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 5030)
+++ trunk/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 5031)
@@ -8,6 +8,7 @@
 
 	this.TabRegistry = new Array();
 	this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix');
+	this.PreviousPrefix = this.ActivePrefix;
 	$ViewMenus = new Array('c');
 }
 
@@ -46,6 +47,11 @@
 		document.getElementById($params[0]).innerHTML = $text;
 	}
 	
+	if ($params[1] != 'categories_div') {
+		// don't add alternative grids to categories, only between item tabs
+		$GridManager.AddAlternativeGrid($Catalog.ActivePrefix, $Catalog.PreviousPrefix, true);
+	}
+	
 	if (isset($Debugger)) $Debugger.Clear();
 }
 
@@ -101,9 +107,10 @@
 	
 	if (this.ActivePrefix != $prefix) {
 		// hide source tab
-		document.getElementById(this.ActivePrefix + '_tab').className = 'catalog-tab-unselected';
-		document.getElementById(this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div').style.display = 'none';
-		this.HideDependentButtons(this.ActivePrefix);
+		this.PreviousPrefix = this.ActivePrefix;
+		document.getElementById(this.PreviousPrefix + '_tab').className = 'catalog-tab-unselected';
+		document.getElementById(this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div').style.display = 'none';
+		this.HideDependentButtons(this.PreviousPrefix);
 	}
 	
 	// show destination tab
@@ -123,7 +130,7 @@
 		var $url = this.URLMask.replace('#TEMPLATE_NAME#', this.queryTabRegistry('prefix', $prefix, 'module_path') + '/catalog_tab');
 		$url = $url.replace('#CATEGORY_ID#', $cat_id);
 		
-		Request.makeRequest($url, this.BusyRequest, $div_id, this.successCallback, this.errorCallback, $div_id);			
+		Request.makeRequest($url, this.BusyRequest, $div_id, this.successCallback, this.errorCallback, $div_id);
 	}
 	/*else {
 		alert('refresh disabled = {tab: '+this.ActivePrefix+'; cat_id: '+$cat_id+'}');
Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r5030 -r5031
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5030)
+++ trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 5031)
@@ -17,7 +17,7 @@
 	  		<script type="text/javascript" src="incs/ajax.js"></script>
 	  		<script type="text/javascript" src="incs/catalog.js"></script>
 	  		<script type="text/javascript">
-	  			_progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#"/>', 'catalog_');	
 				var a_toolbar = new ToolBar();
 					 	
Index: trunk/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -N -r5030 -r5031
--- trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 5030)
+++ trunk/kernel/admin_templates/incs/catalog.js	(.../catalog.js)	(revision 5031)
@@ -8,6 +8,7 @@
 
 	this.TabRegistry = new Array();
 	this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix');
+	this.PreviousPrefix = this.ActivePrefix;
 	$ViewMenus = new Array('c');
 }
 
@@ -46,6 +47,11 @@
 		document.getElementById($params[0]).innerHTML = $text;
 	}
 	
+	if ($params[1] != 'categories_div') {
+		// don't add alternative grids to categories, only between item tabs
+		$GridManager.AddAlternativeGrid($Catalog.ActivePrefix, $Catalog.PreviousPrefix, true);
+	}
+	
 	if (isset($Debugger)) $Debugger.Clear();
 }
 
@@ -101,9 +107,10 @@
 	
 	if (this.ActivePrefix != $prefix) {
 		// hide source tab
-		document.getElementById(this.ActivePrefix + '_tab').className = 'catalog-tab-unselected';
-		document.getElementById(this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div').style.display = 'none';
-		this.HideDependentButtons(this.ActivePrefix);
+		this.PreviousPrefix = this.ActivePrefix;
+		document.getElementById(this.PreviousPrefix + '_tab').className = 'catalog-tab-unselected';
+		document.getElementById(this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div').style.display = 'none';
+		this.HideDependentButtons(this.PreviousPrefix);
 	}
 	
 	// show destination tab
@@ -123,7 +130,7 @@
 		var $url = this.URLMask.replace('#TEMPLATE_NAME#', this.queryTabRegistry('prefix', $prefix, 'module_path') + '/catalog_tab');
 		$url = $url.replace('#CATEGORY_ID#', $cat_id);
 		
-		Request.makeRequest($url, this.BusyRequest, $div_id, this.successCallback, this.errorCallback, $div_id);			
+		Request.makeRequest($url, this.BusyRequest, $div_id, this.successCallback, this.errorCallback, $div_id);
 	}
 	/*else {
 		alert('refresh disabled = {tab: '+this.ActivePrefix+'; cat_id: '+$cat_id+'}');
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r5030 -r5031
--- trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5030)
+++ trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 5031)
@@ -17,7 +17,7 @@
 	  		<script type="text/javascript" src="incs/ajax.js"></script>
 	  		<script type="text/javascript" src="incs/catalog.js"></script>
 	  		<script type="text/javascript">
-	  			_progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 				var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#"/>', 'catalog_');	
 				var a_toolbar = new ToolBar();
 					 	
Index: trunk/kernel/admin_templates/incs/grid.js
===================================================================
diff -u -N -r5022 -r5031
--- trunk/kernel/admin_templates/incs/grid.js	(.../grid.js)	(revision 5022)
+++ trunk/kernel/admin_templates/incs/grid.js	(.../grid.js)	(revision 5031)
@@ -7,19 +7,29 @@
 
 GridManager.prototype.AddAlternativeGrid = function ($source_grid, $destination_grid, $reciprocal) 
 {
+	if ($source_grid == $destination_grid) {
+		return false;
+	}
+	
 	if (typeof(this.AlternativeGrids[$source_grid]) == 'undefined') {
-		// create array if it is first alternative grid to this one
+		// alternative grids not found, create empty list
 		this.AlternativeGrids[$source_grid] = new Array();
 	}
-	this.AlternativeGrids[$source_grid].push($destination_grid);
 	
+	if (!in_array($destination_grid, this.AlternativeGrids[$source_grid])) {
+		// alternative grids found, check if not added already
+		this.AlternativeGrids[$source_grid].push($destination_grid);
+	}
+	
 	if ($reciprocal) {
 		this.AddAlternativeGrid($destination_grid, $source_grid);
 	}
 }
 
 GridManager.prototype.ClearAlternativeGridsSelection = function ($source_prefix)
 {
+	if (!this.AlternativeGrids[$source_prefix]) return false;
+	
 	var $i = 0;
 	while ($i < this.AlternativeGrids[$source_prefix].length) {
 		this.Grids[ this.AlternativeGrids[$source_prefix][$i] ].ClearSelection();