BZ-10458: Changes to retrieve the right estimate from the list