Bug fix for queries where the selected class is not the first one in the list
Bug fix for queries where the selected class is not the first one in the list

git-svn-id: 8a2b0a969c74f87a9c14cf35f460fb9b394f82c6@2160 a333f486-631f-4898-b8df-5754b55c2be0

changi67/itop,changi67/itop,changi67/itop,changi67/itop