Fix wrong locale returned from Url
Code tweaks
Scope locale set