update to use latest jpa-query