Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r10653 -r10780
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 10653)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 10780)
@@ -1778,6 +1778,16 @@
 		}
 
 		/**
+		 * Occures after list is queried
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterListQuery(&$event)
+		{
+
+		}
+
+		/**
 		 * Ensures that popup will be closed automatically
 		 * and parent window will be refreshed with template
 		 * passed
@@ -2139,6 +2149,14 @@
 
 			if ($event->status == erSUCCESS) {
 				$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
+
+				$pass_vars = Array ('st_id', 'cms_id');
+				foreach ($pass_vars as $pass_var) {
+					$data = $this->Application->GetVar($pass_var);
+					if ($data) {
+						$event->SetRedirectParam($pass_var, $data);
+					}
+				}
 			}
 		}