JPA annotation mapping fixed; queries translated to NamedQueries