language selector fixes