added JPA-QL todos