WL-3663 : Put siteId in URL rather than session