CLOUD-225 added annotations, corrections in the jpql