[#808] Fix unicode template 500 error
Merge branch '808-unicode-template-fix2'