modified JPQL