Index: trunk/packages/ezwebin_extension/ezextension/ezwebin/autoloads/ezkeywordlist.php
===================================================================
--- trunk/packages/ezwebin_extension/ezextension/ezwebin/autoloads/ezkeywordlist.php	(revision 4281)
+++ trunk/packages/ezwebin_extension/ezextension/ezwebin/autoloads/ezkeywordlist.php	(working copy)
@@ -61,7 +61,9 @@
             {
                 include_once( 'lib/ezdb/classes/ezdb.php' );
                 $db = eZDB::instance();
-                
+
+                $classID = eZContentObjectTreeNode::classIDByIdentifier( $classIdentifier );
+
                 if( $parentNodeID )
                 {
                     $node = eZContentObjectTreeNode::fetch( $parentNodeID );
@@ -86,14 +88,12 @@
                                                  ezcontentobject,
                                                  ezcontentobject_name,
                                                  ezcontentobject_attribute,
-                                                 ezcontentobject_tree,
-                                                 ezcontentclass
+                                                 ezcontentobject_tree
                                                  $sqlPermissionChecking[from]
                                             WHERE ezkeyword.id = ezkeyword_attribute_link.keyword_id
                                                 AND ezkeyword_attribute_link.objectattribute_id = ezcontentobject_attribute.id
                                                 AND ezcontentobject_tree.contentobject_id = ezcontentobject_attribute.contentobject_id
-                                                AND ezkeyword.class_id = ezcontentclass.id
-                                                AND ezcontentclass.identifier = '" . $classIdentifier . "'
+                                                AND ezcontentobject.contentclass_id = $classID
                                                 $pathString
                                                 $parentNodeIDSQL
                                                 $showInvisibleNodesCond