adding querystring param for language and fixing a couple of bugs