Improve totalling and sub-totaling one estimate