VBID-1851 Set proper character encoding