added tags and fixed the template