#5 - move to standard jpaql and reworked datamodel