Index: branches/RC/core/kernel/event_manager.php
===================================================================
diff -u -r9274 -r9298
--- branches/RC/core/kernel/event_manager.php	(.../event_manager.php)	(revision 9274)
+++ branches/RC/core/kernel/event_manager.php	(.../event_manager.php)	(revision 9298)
@@ -100,6 +100,9 @@
 		{
 			list($prefix) = explode('.', $prefix_special);
 			$query_map = $this->Application->getUnitOption($prefix, 'QueryString');
+			if (!$query_map && preg_match('/(.*)-cdata/', $prefix)) {
+				$query_map = $this->Application->getUnitOption('cdata', 'QueryString');
+			}
 			if ($query_map) {
 				$this->queryMaps[$prefix_special] = $query_map;
 			}