Add name to template.
Fix content parsing (used common reader instead of the push(ed) back reader, and missed first character).