multilingual issues added