Unify both query to prevent retrieving the same object twice.

Thanks to Łukasz Nowak for his contribution.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24744 20353a03-c40f-0410-a6d1-a30d3c3de9de