fix missing encoded_id related change & code clearing.