bugid-98048: Hubs V2 - Wikias Picks - Revise tracking code