Added fixes for all templates