PLA-833 PLA-983 fix for click tracking issue