Changed link handling to fire start and end events