Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r11724 -r11751
--- branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 11724)
+++ branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 11751)
@@ -50,22 +50,6 @@
 		}
 
 		/**
-		 * Save return script in cases, when old sections are opened from new sections
-		 *
-		 * @param Array $params
-		 */
-		function SaveReturnScript($params)
-		{
-			// admin/save_redirect.php?do=
-			$m =& $this->Application->recallObject('m_TagProcessor');
-			$url =  str_replace($this->Application->BaseURL(), '', $m->Link($params) );
-			$url = explode('?', $url, 2);
-			$url = 'save_redirect.php?'.$url[1].'&do='.$url[0];
-
-			$this->Application->StoreVar('ReturnScript', $url);
-		}
-
-		/**
 		 * Returns version of module by name
 		 *
 		 * @param Array $params
Index: branches/RC/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -N -r11623 -r11751
--- branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11751)
@@ -64,8 +64,6 @@
 	</div>
 </inp2:m_DefineElement>
 
-<inp2:adm_SaveReturnScript/>
-
 <inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['visits'].SetDependantToolbarButtons( new Array('reset') );
Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r11743 -r11751
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11743)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11751)
@@ -296,7 +296,8 @@
 				}
 				trigger_error('Requested ID for prefix <b>'.$event->getPrefixSpecial().'</b> <span class="debug_error">not passed</span>',E_USER_NOTICE);
 			}
-			$this->Application->SetVar($event->getPrefixSpecial(true).'_id', $first_id);
+
+			$this->Application->SetVar($event->getPrefixSpecial() . '_id', $first_id);
 			return $ret;
 		}
 
Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r11724 -r11751
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 11724)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 11751)
@@ -742,7 +742,7 @@
 
 			Grids['<inp2:m_param name="PrefixSpecial"/>'].MouseOverClass = '<inp2:m_param name="mouseover_class"/>';
 			Grids['<inp2:m_param name="PrefixSpecial"/>'].StickySelection = true;
-			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
+			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-=]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
 	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
 
 	  		<inp2:m_if check="m_Param" name="selector" equals_to="radio">
Index: branches/RC/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r11724 -r11751
--- branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 11724)
+++ branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 11751)
@@ -68,11 +68,7 @@
 			$this->Application->LinkVar('m_cat_id');
 		}
 
-		$check_events = Array (
-			'OnEdit', 'OnSave', 'OnMassDelete', 'OnMassApprove',
-			'OnMassDecline', 'OnMassMoveUp', 'OnMassMoveDown'
-		);
-		if (in_array($event->Name, $check_events)) {
+		if (in_array($event->Name, $this->_getMassPermissionEvents())) {
 			$items = $this->_getPermissionCheckInfo($event);
 
 			$perm_helper =& $this->Application->recallObject('PermissionsHelper');
@@ -121,6 +117,19 @@
 	}
 
 	/**
+	 * Returns events, that require item-based (not just event-name based) permission check
+	 *
+	 * @return Array
+	 */
+	function _getMassPermissionEvents()
+	{
+		return Array (
+			'OnEdit', 'OnSave', 'OnMassDelete', 'OnMassApprove',
+			'OnMassDecline', 'OnMassMoveUp', 'OnMassMoveDown'
+		);
+	}
+
+	/**
 	 * Returns category item IDs, that require permission checking
 	 *
 	 * @param kEvent $event