Use EntityApi destination for entries.
fix mapping.