changed entities to use @entityID instead of @urn