some changes in jpa queries