Refactor syntax unicode srv multipart 2