Temp fix to generate URIs for entities that should have them