Updated SiteLink support