fixed correct setting of selected country