[hotfix] marketplace picker tracking and longer load