fixed multi language issues (cont.)