further fixes to ID issue