Correction of not use of FetchModeJoin by using Criteria instead of JPAQL
Corrected minor elements after inspection of results