[FOLLOWUP][BUGFIX] Only write out one shortcut tag