Changed the templates to process the id