Fixed the variabled need by the templates.