mapper: fixed entityToData()