- Resource type = graph.getPossibleType(r.resource, L0.Entity);
- if(type == null) type = L0.Entity;
+ String typeId = r.type;
+ if (typeId == null) {
+ Resource type = graph.getPossibleType(r.resource, L0.Entity);
+ typeId = type != null ? graph.getURI(type) : Layer0.URIs.Entity;
+ }