fixxed all templates for template cache