Fix typo and tag bug