Enhancements for Unicode content export