Fix tag appending; some i18n