diff --git a/rslib/src/backend/mod.rs b/rslib/src/backend/mod.rs
index d253519ee..abfebb75e 100644
--- a/rslib/src/backend/mod.rs
+++ b/rslib/src/backend/mod.rs
@@ -292,11 +292,11 @@ impl From<pb::FilterToSearchIn> for Node<'_> {
                     NamedFilter::AddedToday => Node::Search(SearchNode::AddedInDays(1)),
                     NamedFilter::StudiedToday => Node::Search(SearchNode::Rated {
                         days: 1,
-                        ease: EaseKind::Reviewed,
+                        ease: EaseKind::AnyAnswerButton,
                     }),
                     NamedFilter::AgainToday => Node::Search(SearchNode::Rated {
                         days: 1,
-                        ease: EaseKind::Rated(1),
+                        ease: EaseKind::AnswerButton(1),
                     }),
                     NamedFilter::New => Node::Search(SearchNode::State(StateKind::New)),
                     NamedFilter::Learn => Node::Search(SearchNode::State(StateKind::Learning)),
diff --git a/rslib/src/search/parser.rs b/rslib/src/search/parser.rs
index fe0b6b3cc..4197e19ed 100644
--- a/rslib/src/search/parser.rs
+++ b/rslib/src/search/parser.rs
@@ -120,9 +120,9 @@ pub enum TemplateKind<'a> {
 
 #[derive(Debug, PartialEq, Clone)]
 pub enum EaseKind {
-    Rated(u8),
-    Reviewed,
-    Manually,
+    AnswerButton(u8),
+    AnyAnswerButton,
+    ManualReschedule,
 }
 
 /// Parse the input string into a list of nodes.
@@ -367,14 +367,14 @@ fn parse_rated(val: &str) -> ParseResult<SearchNode<'static>> {
 
     let ease = match it.next() {
         Some(v) => {
-            let u: u8 = v.parse().unwrap();
+            let u: u8 = v.parse()?;
             if (1..5).contains(&u) {
-                EaseKind::Rated(u)
+                EaseKind::AnswerButton(u)
             } else {
                 return Err(ParseError {});
             }
         }
-        None => EaseKind::Reviewed,
+        None => EaseKind::AnyAnswerButton,
     };
 
     Ok(SearchNode::Rated { days, ease })
@@ -387,7 +387,7 @@ fn parse_resched(val: &str) -> ParseResult<SearchNode<'static>> {
     let n: u32 = it.next().unwrap().parse()?;
     let days = n.max(1).min(365);
 
-    let ease = EaseKind::Manually;
+    let ease = EaseKind::ManualReschedule;
 
     Ok(SearchNode::Rated { days, ease })
 }
diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs
index 2dafd9386..9114a9110 100644
--- a/rslib/src/search/sqlwriter.rs
+++ b/rslib/src/search/sqlwriter.rs
@@ -225,9 +225,9 @@ impl SqlWriter<'_> {
         .unwrap();
 
         match ease {
-            EaseKind::Rated(u) => write!(self.sql, " and ease = {})", u),
-            EaseKind::Reviewed => write!(self.sql, " and ease between 1 and 4)"),
-            EaseKind::Manually => write!(self.sql, " and ease = 0)"),
+            EaseKind::AnswerButton(u) => write!(self.sql, " and ease = {})", u),
+            EaseKind::AnyAnswerButton => write!(self.sql, " and ease between 1 and 4)"),
+            EaseKind::ManualReschedule => write!(self.sql, " and ease = 0)"),
         }
         .unwrap();
 
diff --git a/rslib/src/search/writer.rs b/rslib/src/search/writer.rs
index f58143df0..0b67224f7 100644
--- a/rslib/src/search/writer.rs
+++ b/rslib/src/search/writer.rs
@@ -157,9 +157,9 @@ fn write_template(template: &TemplateKind) -> String {
 fn write_rated(days: &u32, ease: &EaseKind) -> String {
     use EaseKind::*;
     match ease {
-        Rated(n) => format!("\"rated:{}:{}\"", days, n),
-        Reviewed => format!("\"rated:{}\"", days),
-        Manually => format!("\"resched:{}\"", days),
+        AnswerButton(n) => format!("\"rated:{}:{}\"", days, n),
+        AnyAnswerButton => format!("\"rated:{}\"", days),
+        ManualReschedule => format!("\"resched:{}\"", days),
     }
 }