Added survey data calculation on save/update.