fixed JPQL Query Engine to correctly manage fetch groups