Fix entity creation on interation

When iterating on URLs and one of the url returns a single object we
return that object.