BZ-9998: markup changes for estimator