Track Link Clicks bug fixes