Tracking links fix