diff --git a/cmd/horsebot/skill.go b/cmd/horsebot/skill.go
index b79ad27..a749df0 100644
--- a/cmd/horsebot/skill.go
+++ b/cmd/horsebot/skill.go
@@ -28,16 +28,20 @@ func newSkillServer(skills []horse.Skill, groups []horse.SkillGroup) *skillServe
 	}
 	for _, skill := range skills {
 		s.skills[skill.ID] = skill
-		s.byName[skill.Name] = skill.ID
+		id := strconv.Itoa(int(skill.ID))
 		switch {
 		case skill.UniqueOwner == "":
-			s.autocom.Add(skill.Name, discord.AutocompleteChoiceString{Name: skill.Name, Value: strconv.Itoa(int(skill.ID))})
+			s.byName[skill.Name] = skill.ID
+			s.autocom.Add(skill.Name, discord.AutocompleteChoiceString{Name: skill.Name, Value: id})
 		case skill.Rarity >= 3:
-			s.autocom.Add(skill.Name, discord.AutocompleteChoiceString{Name: skill.Name, Value: skill.Name})
-			s.autocom.Add(skill.UniqueOwner, discord.AutocompleteChoiceString{Name: "Unique: " + skill.UniqueOwner, Value: strconv.Itoa(int(skill.ID))})
+			s.byName[skill.Name] = skill.ID
+			s.autocom.Add(skill.Name, discord.AutocompleteChoiceString{Name: skill.Name, Value: id})
+			s.autocom.Add(skill.UniqueOwner, discord.AutocompleteChoiceString{Name: "Unique: " + skill.UniqueOwner, Value: id})
 		default:
-			s.autocom.Add(skill.Name, discord.AutocompleteChoiceString{Name: skill.Name + " (Inherited)", Value: strconv.Itoa(int(skill.ID))})
-			s.autocom.Add(skill.UniqueOwner, discord.AutocompleteChoiceString{Name: "Inherited unique: " + skill.UniqueOwner, Value: skill.Name})
+			name := skill.Name + " (Inherited)"
+			s.byName[name] = skill.ID
+			s.autocom.Add(name, discord.AutocompleteChoiceString{Name: name, Value: id})
+			s.autocom.Add(skill.UniqueOwner, discord.AutocompleteChoiceString{Name: "Inherited unique: " + skill.UniqueOwner, Value: id})
 		}
 	}
 	for _, g := range groups {