re-added @Entity (mistakenly removed); also re-added @NamedQueries until we can verify if this removal was desired