Fixed templates - no addtional info issue