Fix correct OID tree and severity handling