Fix UniqueId field in external calls model can be blank