fix calculated fields to push to save