Fixed npe updating calculated attributes not included in UI