EDOC-811 Solution added to work with special characters
EDOC-811 Refactored