clicktracking infrastructure fixes per Karol