Follow up on #3702

- Removed modifier from i18n bundles
- General clean-up
- Fixed XSS issue