Correction bug dhql
Refactoring