Fix JPA Query an go on implementing Proposals.