Improved estimate editing logic to help mitigate the possibility of lost estimates