[TASK]More adjustments for new typo template structure