Fix issue clicking marketplace link
Add events for load and update