BC Fix - shortcode in sitelink URLs again.