Modify the way to get data back + minor changes

Retrieving the data from the link and not the target event.