diff --git a/Cargo.lock b/Cargo.lock
index 06df1d6ede..0437792a17 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4456,9 +4456,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.143"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
 dependencies = [
  "serde_derive",
 ]
@@ -4475,9 +4475,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.143"
+version = "1.0.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/nu-command/src/bytes/index_of.rs b/crates/nu-command/src/bytes/index_of.rs
index 335e3b1ee3..26c1a55e7f 100644
--- a/crates/nu-command/src/bytes/index_of.rs
+++ b/crates/nu-command/src/bytes/index_of.rs
@@ -49,7 +49,7 @@ impl Command for BytesIndexOf {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["pattern", "match", "find", "search", "index"]
+        vec!["pattern", "match", "find", "search"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/bytes/length.rs b/crates/nu-command/src/bytes/length.rs
index 9e8dbb162e..8e7d8a77ce 100644
--- a/crates/nu-command/src/bytes/length.rs
+++ b/crates/nu-command/src/bytes/length.rs
@@ -39,7 +39,7 @@ impl Command for BytesLen {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["len", "size", "count"]
+        vec!["size", "count"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index 804dd91cc1..d2fa20817c 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -29,7 +29,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "binary", "bytes", "bin"]
+        vec!["convert", "bytes"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/conversions/into/datetime.rs b/crates/nu-command/src/conversions/into/datetime.rs
index 8a7888efb9..5812821872 100644
--- a/crates/nu-command/src/conversions/into/datetime.rs
+++ b/crates/nu-command/src/conversions/into/datetime.rs
@@ -103,7 +103,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "date", "time", "timezone", "UTC"]
+        vec!["convert", "timezone", "UTC"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/conversions/into/filesize.rs b/crates/nu-command/src/conversions/into/filesize.rs
index 646a9bcb93..b000519dad 100644
--- a/crates/nu-command/src/conversions/into/filesize.rs
+++ b/crates/nu-command/src/conversions/into/filesize.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "number", "size", "bytes"]
+        vec!["convert", "number", "bytes"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index 387933bbbc..6255102958 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -38,7 +38,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "str", "text"]
+        vec!["convert", "text"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/core_commands/error_make.rs b/crates/nu-command/src/core_commands/error_make.rs
index a98aaaa881..a816540034 100644
--- a/crates/nu-command/src/core_commands/error_make.rs
+++ b/crates/nu-command/src/core_commands/error_make.rs
@@ -29,7 +29,7 @@ impl Command for ErrorMake {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["err", "panic", "crash", "throw"]
+        vec!["panic", "crash", "throw"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/database/commands/collect.rs b/crates/nu-command/src/database/commands/collect.rs
index b69dd5506e..6e514f9d78 100644
--- a/crates/nu-command/src/database/commands/collect.rs
+++ b/crates/nu-command/src/database/commands/collect.rs
@@ -34,7 +34,7 @@ impl Command for CollectDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "collect"]
+        vec!["database"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/database/commands/describe.rs b/crates/nu-command/src/database/commands/describe.rs
index 6c2d91eefa..23d089dbe2 100644
--- a/crates/nu-command/src/database/commands/describe.rs
+++ b/crates/nu-command/src/database/commands/describe.rs
@@ -47,7 +47,7 @@ impl Command for DescribeDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "SQLite", "describe"]
+        vec!["database", "SQLite"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/database/commands/from.rs b/crates/nu-command/src/database/commands/from.rs
index f391d1671a..712f777ad9 100644
--- a/crates/nu-command/src/database/commands/from.rs
+++ b/crates/nu-command/src/database/commands/from.rs
@@ -41,7 +41,7 @@ impl Command for FromDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "from"]
+        vec!["database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/into_sqlite.rs b/crates/nu-command/src/database/commands/into_sqlite.rs
index 3a8fc2b996..2df206cab7 100644
--- a/crates/nu-command/src/database/commands/into_sqlite.rs
+++ b/crates/nu-command/src/database/commands/into_sqlite.rs
@@ -49,7 +49,7 @@ impl Command for IntoSqliteDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "sqlite", "database"]
+        vec!["convert", "database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/join.rs b/crates/nu-command/src/database/commands/join.rs
index 60d011cca2..9498249df0 100644
--- a/crates/nu-command/src/database/commands/join.rs
+++ b/crates/nu-command/src/database/commands/join.rs
@@ -47,7 +47,7 @@ impl Command for JoinDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "join"]
+        vec!["database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/limit.rs b/crates/nu-command/src/database/commands/limit.rs
index 96462d178a..0a43144daa 100644
--- a/crates/nu-command/src/database/commands/limit.rs
+++ b/crates/nu-command/src/database/commands/limit.rs
@@ -34,7 +34,7 @@ impl Command for LimitDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "limit"]
+        vec!["database", "head", "tail"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/open.rs b/crates/nu-command/src/database/commands/open.rs
index c7fb96a132..25fad05e65 100644
--- a/crates/nu-command/src/database/commands/open.rs
+++ b/crates/nu-command/src/database/commands/open.rs
@@ -29,7 +29,7 @@ impl Command for OpenDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "open"]
+        vec!["database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/order_by.rs b/crates/nu-command/src/database/commands/order_by.rs
index 4acb0629b5..d7bd084457 100644
--- a/crates/nu-command/src/database/commands/order_by.rs
+++ b/crates/nu-command/src/database/commands/order_by.rs
@@ -37,7 +37,7 @@ impl Command for OrderByDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "order-by"]
+        vec!["database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/schema.rs b/crates/nu-command/src/database/commands/schema.rs
index e9566076d9..5e6e002379 100644
--- a/crates/nu-command/src/database/commands/schema.rs
+++ b/crates/nu-command/src/database/commands/schema.rs
@@ -34,7 +34,7 @@ impl Command for SchemaDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "info", "SQLite", "schema"]
+        vec!["database", "info", "SQLite"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/database/commands/select.rs b/crates/nu-command/src/database/commands/select.rs
index 098ee98bcd..e8ae79d39f 100644
--- a/crates/nu-command/src/database/commands/select.rs
+++ b/crates/nu-command/src/database/commands/select.rs
@@ -33,7 +33,7 @@ impl Command for ProjectionDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "select"]
+        vec!["database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/to_db.rs b/crates/nu-command/src/database/commands/to_db.rs
index 0df0e0a2d3..4d07b41a60 100644
--- a/crates/nu-command/src/database/commands/to_db.rs
+++ b/crates/nu-command/src/database/commands/to_db.rs
@@ -30,7 +30,7 @@ impl Command for ToDataBase {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "into", "db"]
+        vec!["database", "convert"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/commands/where_.rs b/crates/nu-command/src/database/commands/where_.rs
index b08d7d363f..a39b13d46f 100644
--- a/crates/nu-command/src/database/commands/where_.rs
+++ b/crates/nu-command/src/database/commands/where_.rs
@@ -31,7 +31,7 @@ impl Command for WhereDb {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "where"]
+        vec!["database"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/expressions/and.rs b/crates/nu-command/src/database/expressions/and.rs
index 437b2ee6af..76a92c1be3 100644
--- a/crates/nu-command/src/database/expressions/and.rs
+++ b/crates/nu-command/src/database/expressions/and.rs
@@ -30,7 +30,7 @@ impl Command for AndExpr {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "and", "expression"]
+        vec!["database", "expression"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/expressions/or.rs b/crates/nu-command/src/database/expressions/or.rs
index 5d77bab3ee..66f252613b 100644
--- a/crates/nu-command/src/database/expressions/or.rs
+++ b/crates/nu-command/src/database/expressions/or.rs
@@ -30,7 +30,7 @@ impl Command for OrExpr {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "or", "expression"]
+        vec!["database", "expression"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/database/expressions/over.rs b/crates/nu-command/src/database/expressions/over.rs
index f09b363437..eb83007de4 100644
--- a/crates/nu-command/src/database/expressions/over.rs
+++ b/crates/nu-command/src/database/expressions/over.rs
@@ -92,7 +92,7 @@ impl Command for OverExpr {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["database", "over", "expression"]
+        vec!["database", "expression"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/date/date_.rs b/crates/nu-command/src/date/date_.rs
index a3943a4fc7..d0750c61d8 100644
--- a/crates/nu-command/src/date/date_.rs
+++ b/crates/nu-command/src/date/date_.rs
@@ -23,7 +23,6 @@ impl Command for Date {
 
     fn search_terms(&self) -> Vec<&str> {
         vec![
-            "date",
             "time",
             "now",
             "today",
diff --git a/crates/nu-command/src/date/format.rs b/crates/nu-command/src/date/format.rs
index 66184586bf..5b9e5ef944 100644
--- a/crates/nu-command/src/date/format.rs
+++ b/crates/nu-command/src/date/format.rs
@@ -35,7 +35,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["date", "format", "strftime"]
+        vec!["fmt", "strftime"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/date/humanize.rs b/crates/nu-command/src/date/humanize.rs
index 8b20eff084..7b070a7334 100644
--- a/crates/nu-command/src/date/humanize.rs
+++ b/crates/nu-command/src/date/humanize.rs
@@ -22,8 +22,6 @@ impl Command for SubCommand {
 
     fn search_terms(&self) -> Vec<&str> {
         vec![
-            "date",
-            "humanize",
             "relative",
             "now",
             "today",
diff --git a/crates/nu-command/src/date/list_timezone.rs b/crates/nu-command/src/date/list_timezone.rs
index bdf3beab3b..f2827d351f 100644
--- a/crates/nu-command/src/date/list_timezone.rs
+++ b/crates/nu-command/src/date/list_timezone.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["UTC", "GMT", "timezone", "list", "list-timezone"]
+        vec!["UTC", "GMT", "tz"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/date/now.rs b/crates/nu-command/src/date/now.rs
index 4efbdff08d..fd2d8f4ecb 100644
--- a/crates/nu-command/src/date/now.rs
+++ b/crates/nu-command/src/date/now.rs
@@ -19,7 +19,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["date", "now", "present", "current-time"]
+        vec!["present", "current-time"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/date/to_record.rs b/crates/nu-command/src/date/to_record.rs
index e43790e1b0..44633943f7 100644
--- a/crates/nu-command/src/date/to_record.rs
+++ b/crates/nu-command/src/date/to_record.rs
@@ -23,7 +23,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["date", "to", "record", "structured", "table"]
+        vec!["structured", "table"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/date/to_table.rs b/crates/nu-command/src/date/to_table.rs
index dd84bf33b3..4de85ac6e6 100644
--- a/crates/nu-command/src/date/to_table.rs
+++ b/crates/nu-command/src/date/to_table.rs
@@ -23,7 +23,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["date", "to", "record", "structured", "table"]
+        vec!["structured"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/date/to_timezone.rs b/crates/nu-command/src/date/to_timezone.rs
index 82c1324675..fc4cc3990e 100644
--- a/crates/nu-command/src/date/to_timezone.rs
+++ b/crates/nu-command/src/date/to_timezone.rs
@@ -34,9 +34,7 @@ impl Command for SubCommand {
 
     fn search_terms(&self) -> Vec<&str> {
         vec![
-            "date",
-            "to",
-            "timezone",
+            "tz",
             "transform",
             "convert",
             "UTC",
diff --git a/crates/nu-command/src/experimental/is_admin.rs b/crates/nu-command/src/experimental/is_admin.rs
index 4cceb4c0e6..0de4dafc42 100644
--- a/crates/nu-command/src/experimental/is_admin.rs
+++ b/crates/nu-command/src/experimental/is_admin.rs
@@ -20,7 +20,7 @@ impl Command for IsAdmin {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["root", "admin", "administrator", "superuser", "supervisor"]
+        vec!["root", "administrator", "superuser", "supervisor"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index 19598c927e..1812efb632 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -20,7 +20,7 @@ impl Command for Cd {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["cd", "change", "directory", "dir", "folder", "switch"]
+        vec!["change", "directory", "dir", "folder", "switch"]
     }
 
     fn signature(&self) -> nu_protocol::Signature {
diff --git a/crates/nu-command/src/filesystem/cp.rs b/crates/nu-command/src/filesystem/cp.rs
index 1fdd96ddb5..1fa46e0b37 100644
--- a/crates/nu-command/src/filesystem/cp.rs
+++ b/crates/nu-command/src/filesystem/cp.rs
@@ -36,7 +36,7 @@ impl Command for Cp {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["cp", "copy", "file", "files"]
+        vec!["copy", "file", "files"]
     }
 
     fn signature(&self) -> Signature {
diff --git a/crates/nu-command/src/filesystem/glob.rs b/crates/nu-command/src/filesystem/glob.rs
index 4efe6b013f..885f4a4e64 100644
--- a/crates/nu-command/src/filesystem/glob.rs
+++ b/crates/nu-command/src/filesystem/glob.rs
@@ -33,7 +33,7 @@ impl Command for Glob {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["glob", "files", "folders", "list", "ls"]
+        vec!["pattern", "files", "folders", "list", "ls"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/filesystem/mkdir.rs b/crates/nu-command/src/filesystem/mkdir.rs
index b08cfd31f4..89a249efd8 100644
--- a/crates/nu-command/src/filesystem/mkdir.rs
+++ b/crates/nu-command/src/filesystem/mkdir.rs
@@ -33,15 +33,7 @@ impl Command for Mkdir {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec![
-            "mkdir",
-            "make",
-            "directory",
-            "dir",
-            "folder",
-            "make_dir",
-            "make_dirs",
-        ]
+        vec!["directory", "folder", "create", "make_dirs"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/filesystem/mv.rs b/crates/nu-command/src/filesystem/mv.rs
index b0ef89d699..690ad8de30 100644
--- a/crates/nu-command/src/filesystem/mv.rs
+++ b/crates/nu-command/src/filesystem/mv.rs
@@ -31,7 +31,7 @@ impl Command for Mv {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["mv", "move"]
+        vec!["move"]
     }
 
     fn signature(&self) -> nu_protocol::Signature {
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 44feeb62ec..c298c2dec9 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -28,7 +28,7 @@ impl Command for Open {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["open", "load", "read", "load_file", "read_file"]
+        vec!["load", "read", "load_file", "read_file"]
     }
 
     fn signature(&self) -> nu_protocol::Signature {
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index d023d03deb..c3533e7997 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -40,7 +40,7 @@ impl Command for Rm {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["rm", "remove"]
+        vec!["delete", "remove"]
     }
 
     fn signature(&self) -> Signature {
diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index 1d5f5b189d..b5070c97c6 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -25,7 +25,7 @@ impl Command for Touch {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["touch"]
+        vec!["create", "file"]
     }
 
     fn signature(&self) -> Signature {
diff --git a/crates/nu-command/src/filters/each_while.rs b/crates/nu-command/src/filters/each_while.rs
index 18f4469642..3f731f2926 100644
--- a/crates/nu-command/src/filters/each_while.rs
+++ b/crates/nu-command/src/filters/each_while.rs
@@ -19,7 +19,7 @@ impl Command for EachWhile {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["for", "loop", "iterate", "while"]
+        vec!["for", "loop", "iterate"]
     }
 
     fn signature(&self) -> nu_protocol::Signature {
diff --git a/crates/nu-command/src/filters/length.rs b/crates/nu-command/src/filters/length.rs
index ea98558ffa..10d202fc6c 100644
--- a/crates/nu-command/src/filters/length.rs
+++ b/crates/nu-command/src/filters/length.rs
@@ -25,7 +25,7 @@ impl Command for Length {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["count", "len", "size", "wc"]
+        vec!["count", "size", "wc"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/formats/to/text.rs b/crates/nu-command/src/formats/to/text.rs
index da5a3bdd95..95085c8b94 100644
--- a/crates/nu-command/src/formats/to/text.rs
+++ b/crates/nu-command/src/formats/to/text.rs
@@ -68,7 +68,7 @@ impl Command for ToText {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["text", "convert"]
+        vec!["convert"]
     }
 }
 
diff --git a/crates/nu-command/src/math/avg.rs b/crates/nu-command/src/math/avg.rs
index 08e221b89d..dac06913e4 100644
--- a/crates/nu-command/src/math/avg.rs
+++ b/crates/nu-command/src/math/avg.rs
@@ -21,7 +21,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["average", "mean"]
+        vec!["average", "mean", "statistics"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/math/ceil.rs b/crates/nu-command/src/math/ceil.rs
index 7b87d97fac..3aa6697e02 100644
--- a/crates/nu-command/src/math/ceil.rs
+++ b/crates/nu-command/src/math/ceil.rs
@@ -19,7 +19,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["ceiling"]
+        vec!["ceiling", "round up", "rounding", "integer"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/math/floor.rs b/crates/nu-command/src/math/floor.rs
index d05698681a..cc7a4ad48b 100644
--- a/crates/nu-command/src/math/floor.rs
+++ b/crates/nu-command/src/math/floor.rs
@@ -19,7 +19,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["floor"]
+        vec!["round down", "rounding", "integer"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/math/median.rs b/crates/nu-command/src/math/median.rs
index 96e81b25c1..034449bb81 100644
--- a/crates/nu-command/src/math/median.rs
+++ b/crates/nu-command/src/math/median.rs
@@ -23,7 +23,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["middle", "median"]
+        vec!["middle", "statistics"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/math/stddev.rs b/crates/nu-command/src/math/stddev.rs
index cc10c1d2f5..cb76fd40c5 100644
--- a/crates/nu-command/src/math/stddev.rs
+++ b/crates/nu-command/src/math/stddev.rs
@@ -23,7 +23,14 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["SD", "standard", "deviation", "dispersion", "variation"]
+        vec![
+            "SD",
+            "standard",
+            "deviation",
+            "dispersion",
+            "variation",
+            "statistics",
+        ]
     }
 
     fn run(
diff --git a/crates/nu-command/src/math/variance.rs b/crates/nu-command/src/math/variance.rs
index e630de7dd9..d70eba7634 100644
--- a/crates/nu-command/src/math/variance.rs
+++ b/crates/nu-command/src/math/variance.rs
@@ -22,7 +22,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["deviation", "dispersion", "variance", "variation"]
+        vec!["deviation", "dispersion", "variation", "statistics"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/fetch.rs b/crates/nu-command/src/network/fetch.rs
index ea16aba985..e07729634a 100644
--- a/crates/nu-command/src/network/fetch.rs
+++ b/crates/nu-command/src/network/fetch.rs
@@ -94,7 +94,7 @@ impl Command for SubCommand {
 
     fn search_terms(&self) -> Vec<&str> {
         vec![
-            "network", "fetch", "get", "pull", "request", "http", "download", "curl", "wget",
+            "network", "get", "pull", "request", "http", "download", "curl", "wget",
         ]
     }
 
diff --git a/crates/nu-command/src/network/port.rs b/crates/nu-command/src/network/port.rs
index e3ed51796f..9d29de942a 100644
--- a/crates/nu-command/src/network/port.rs
+++ b/crates/nu-command/src/network/port.rs
@@ -32,7 +32,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["network", "http", "port"]
+        vec!["network", "http"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/post.rs b/crates/nu-command/src/network/post.rs
index 3cb87386e6..fec460a95e 100644
--- a/crates/nu-command/src/network/post.rs
+++ b/crates/nu-command/src/network/post.rs
@@ -80,7 +80,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["network", "post", "send", "push", "http"]
+        vec!["network", "send", "push", "http"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/url/host.rs b/crates/nu-command/src/network/url/host.rs
index 53ca10546b..9072bdf321 100644
--- a/crates/nu-command/src/network/url/host.rs
+++ b/crates/nu-command/src/network/url/host.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["url", "host", "hostname"]
+        vec!["hostname"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/url/path.rs b/crates/nu-command/src/network/url/path.rs
index 8e7e896ee5..a6bf7a000d 100644
--- a/crates/nu-command/src/network/url/path.rs
+++ b/crates/nu-command/src/network/url/path.rs
@@ -25,10 +25,6 @@ impl Command for SubCommand {
         "Get the path of a URL"
     }
 
-    fn search_terms(&self) -> Vec<&str> {
-        vec!["url", "path"]
-    }
-
     fn run(
         &self,
         engine_state: &EngineState,
diff --git a/crates/nu-command/src/network/url/query.rs b/crates/nu-command/src/network/url/query.rs
index 8ffbad8dc0..195c1fafd5 100644
--- a/crates/nu-command/src/network/url/query.rs
+++ b/crates/nu-command/src/network/url/query.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["url", "query", "parameter"]
+        vec!["parameter"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/url/scheme.rs b/crates/nu-command/src/network/url/scheme.rs
index 729a5e042f..23b4f42cf3 100644
--- a/crates/nu-command/src/network/url/scheme.rs
+++ b/crates/nu-command/src/network/url/scheme.rs
@@ -26,7 +26,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["url", "scheme", "protocol"]
+        vec!["protocol"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/network/url/url_.rs b/crates/nu-command/src/network/url/url_.rs
index 7bad2e1587..52c4818823 100644
--- a/crates/nu-command/src/network/url/url_.rs
+++ b/crates/nu-command/src/network/url/url_.rs
@@ -22,7 +22,7 @@ impl Command for Url {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["url", "network", "parse"]
+        vec!["network", "parse"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/format/filesize.rs b/crates/nu-command/src/strings/format/filesize.rs
index 3d09a93e79..c74a7f0c7a 100644
--- a/crates/nu-command/src/strings/format/filesize.rs
+++ b/crates/nu-command/src/strings/format/filesize.rs
@@ -35,7 +35,7 @@ impl Command for FileSize {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "display", "pattern", "file", "size"]
+        vec!["convert", "display", "pattern", "human readable"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/split/column.rs b/crates/nu-command/src/strings/split/column.rs
index bb57adc69c..0cd8b78eac 100644
--- a/crates/nu-command/src/strings/split/column.rs
+++ b/crates/nu-command/src/strings/split/column.rs
@@ -34,7 +34,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["column", "separate", "divide"]
+        vec!["separate", "divide"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/split/list.rs b/crates/nu-command/src/strings/split/list.rs
index 7c362d4c5f..a18fd5ac78 100644
--- a/crates/nu-command/src/strings/split/list.rs
+++ b/crates/nu-command/src/strings/split/list.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["list", "separate", "divide"]
+        vec!["separate", "divide"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/split/row.rs b/crates/nu-command/src/strings/split/row.rs
index d4ce5445ef..c19a8b6832 100644
--- a/crates/nu-command/src/strings/split/row.rs
+++ b/crates/nu-command/src/strings/split/row.rs
@@ -34,7 +34,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["row", "separate", "divide"]
+        vec!["separate", "divide"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/split/words.rs b/crates/nu-command/src/strings/split/words.rs
index e0cfdb3dcb..5012dc6737 100644
--- a/crates/nu-command/src/strings/split/words.rs
+++ b/crates/nu-command/src/strings/split/words.rs
@@ -45,7 +45,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["word", "separate", "divide"]
+        vec!["separate", "divide"]
     }
 
     fn examples(&self) -> Vec<Example> {
diff --git a/crates/nu-command/src/strings/str_/case/screaming_snake_case.rs b/crates/nu-command/src/strings/str_/case/screaming_snake_case.rs
index 365edecec7..af25878781 100644
--- a/crates/nu-command/src/strings/str_/case/screaming_snake_case.rs
+++ b/crates/nu-command/src/strings/str_/case/screaming_snake_case.rs
@@ -29,7 +29,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "style", "snake", "underscore", "convention"]
+        vec!["convert", "style", "underscore", "convention"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/str_/case/snake_case.rs b/crates/nu-command/src/strings/str_/case/snake_case.rs
index 4ed5fa4218..0459790933 100644
--- a/crates/nu-command/src/strings/str_/case/snake_case.rs
+++ b/crates/nu-command/src/strings/str_/case/snake_case.rs
@@ -29,14 +29,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec![
-            "convert",
-            "style",
-            "snake",
-            "underscore",
-            "lower",
-            "convention",
-        ]
+        vec!["convert", "style", "underscore", "lower", "convention"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/str_/case/title_case.rs b/crates/nu-command/src/strings/str_/case/title_case.rs
index cb5eb5caf2..39b574b805 100644
--- a/crates/nu-command/src/strings/str_/case/title_case.rs
+++ b/crates/nu-command/src/strings/str_/case/title_case.rs
@@ -30,7 +30,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["convert", "style", "title", "convention"]
+        vec!["convert", "style", "convention"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/str_/index_of.rs b/crates/nu-command/src/strings/str_/index_of.rs
index 4e1d8a0e9f..0ffd7be814 100644
--- a/crates/nu-command/src/strings/str_/index_of.rs
+++ b/crates/nu-command/src/strings/str_/index_of.rs
@@ -52,7 +52,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["pattern", "match", "find", "search", "index"]
+        vec!["pattern", "match", "find", "search"]
     }
 
     fn run(
diff --git a/crates/nu-command/src/strings/str_/length.rs b/crates/nu-command/src/strings/str_/length.rs
index 04ebcb16c6..ec7330305e 100644
--- a/crates/nu-command/src/strings/str_/length.rs
+++ b/crates/nu-command/src/strings/str_/length.rs
@@ -28,7 +28,7 @@ impl Command for SubCommand {
     }
 
     fn search_terms(&self) -> Vec<&str> {
-        vec!["len", "size", "count"]
+        vec!["size", "count"]
     }
 
     fn run(
diff --git a/crates/nu-command/tests/main.rs b/crates/nu-command/tests/main.rs
index fcca4fa272..4eedfd2b64 100644
--- a/crates/nu-command/tests/main.rs
+++ b/crates/nu-command/tests/main.rs
@@ -23,3 +23,55 @@ fn quickcheck_parse(data: String) -> bool {
     }
     true
 }
+
+#[test]
+fn signature_name_matches_command_name() {
+    let ctx = crate::create_default_context();
+    let decls = ctx.get_decl_ids_sorted(true);
+    let mut failures = Vec::new();
+
+    for decl_id in decls {
+        let cmd = ctx.get_decl(decl_id);
+        let cmd_name = cmd.name();
+        let sig_name = cmd.signature().name;
+        let category = cmd.signature().category;
+
+        if cmd_name != sig_name {
+            failures.push(format!(
+                "{cmd_name} ({category:?}): Signature name \"{sig_name}\" is not equal to the command name \"{cmd_name}\""
+            ));
+        }
+    }
+
+    assert!(
+        failures.is_empty(),
+        "Name mismatch:\n{}",
+        failures.join("\n")
+    );
+}
+
+#[test]
+fn no_search_term_duplicates() {
+    let ctx = crate::create_default_context();
+    let decls = ctx.get_decl_ids_sorted(true);
+    let mut failures = Vec::new();
+
+    for decl_id in decls {
+        let cmd = ctx.get_decl(decl_id);
+        let cmd_name = cmd.name();
+        let search_terms = cmd.search_terms();
+        let category = cmd.signature().category;
+
+        for search_term in search_terms {
+            if cmd_name.contains(search_term) {
+                failures.push(format!("{cmd_name} ({category:?}): Search term \"{search_term}\" is substring of command name \"{cmd_name}\""));
+            }
+        }
+    }
+
+    assert!(
+        failures.is_empty(),
+        "Duplication in search terms:\n{}",
+        failures.join("\n")
+    );
+}