[FOLLOWUP][TASK] Restructure typolink tag generation