BZ-11718: Fix issues while calculating annual savings