Fixed assignment of link source & target in DataProvider