fix new chart by using deletedAt in calculation