Fixed storage of links in datastore