Fix for special characters
Add additional extended information