fix repeated fields for non-persisted entities