diff --git a/jamesql/rewriter.py b/jamesql/rewriter.py
index 1893ccb..a8710c9 100644
--- a/jamesql/rewriter.py
+++ b/jamesql/rewriter.py
@@ -8,8 +8,8 @@
 grammar = """
 start: (query)+ sort_component?
 
-or_query: (query ("OR ") query)*
-and_query: (query ("AND ") query)*
+or_query: (query ("OR " | "or ") query)*
+and_query: (query ("AND " | "and ") query)*
 query: and_query | or_query | query_component
 query_component: (negate_query | range_query | strict_search_query | word_query | field_query | comparison)+