diff --git a/commands.go b/commands.go
index 4274c12..a67dff1 100644
--- a/commands.go
+++ b/commands.go
@@ -28,17 +28,18 @@ var SearchCommandDefinition = &discordgo.ApplicationCommand{
 	Description: "Search for a course",
 	Options: []*discordgo.ApplicationCommandOption{
 		{
-			Type:        discordgo.ApplicationCommandOptionString,
-			MinLength:   GetPointer(0),
-			MaxLength:   16,
-			Name:        "title",
-			Description: "Course Title",
-			Required:    false,
+			Type:         discordgo.ApplicationCommandOptionString,
+			MinLength:    GetPointer(0),
+			MaxLength:    48,
+			Name:         "title",
+			Description:  "Course Title (exact, use autocomplete)",
+			Required:     false,
+			Autocomplete: true,
 		},
 		{
 			Type:        discordgo.ApplicationCommandOptionString,
 			Name:        "code",
-			MinLength:   GetPointer(2),
+			MinLength:   GetPointer(4),
 			Description: "Course Code (e.g. 3743, 3000-3999, 3xxx, 3000-)",
 			Required:    false,
 		},
@@ -52,7 +53,20 @@ var SearchCommandDefinition = &discordgo.ApplicationCommand{
 			Type:        discordgo.ApplicationCommandOptionString,
 			Name:        "keywords",
 			Description: "Keywords in Title or Description (space separated)",
-			Required:    false,
+		},
+		{
+			Type:         discordgo.ApplicationCommandOptionString,
+			Name:         "instructor",
+			Description:  "Instructor Name",
+			Required:     false,
+			Autocomplete: true,
+		},
+		{
+			Type:         discordgo.ApplicationCommandOptionString,
+			Name:         "subject",
+			Description:  "Subject (e.g. Computer Science/CS, Mathematics/MAT)",
+			Required:     false,
+			Autocomplete: true,
 		},
 	},
 }