fixed OID not working correctly. still should use ID.
fixed OID issues.