bugfix in query grammar
access mapping via storable constructor instead of calling getEntityMapping()