Fixed small bugs with ID and estimate