trim id
some merge and api change