Added fixes for language and country detection