fixed output templates to match grammar updates