Index: branches/RC/core/units/themes/themes_eh.php
===================================================================
diff -u -N -r10745 -r11495
--- branches/RC/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 10745)
+++ branches/RC/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 11495)
@@ -77,6 +77,13 @@
 		 */
 		function OnChangeTheme(&$event)
 		{
+			if ($this->Application->IsAdmin()) {
+				// for structure theme dropdown
+				$this->Application->StoreVar('theme_id', $this->Application->GetVar('theme'));
+				$this->Application->StoreVar('RefreshStructureTree', 1);
+				return ;
+			}
+
 			$this->Application->SetVar('t', 'index');
 			$this->Application->SetVar('m_cat_id', 0);
 
@@ -98,14 +105,14 @@
 		{
 			parent::SetCustomQuery($event);
 
-			if ($this->Application->IsAdmin()) {
-				return ;
-			}
+			if ($event->Special == 'enabled' || !$this->Application->IsAdmin()) {
+				// "enabled" special or Front-End
 
-			$object =& $event->getObject();
-			/* @var $object kDBList */
+				$object =& $event->getObject();
+				/* @var $object kDBList */
 
-			$object->addFilter('enabled', '%1$s.Enabled = 1');
+				$object->addFilter('enabled_filter', '%1$s.Enabled = 1');
+			}
 		}
 	}