Reverted back utf8x changes
Fixed typos in templates