bugid-98660: Hubs: Popular Videos - Revise tracking code