Fix for template data showing