diff --git a/lib/mu-date.c b/lib/mu-date.c
index f7a6e935..280b0678 100644
--- a/lib/mu-date.c
+++ b/lib/mu-date.c
@@ -105,14 +105,19 @@ mu_date_parse_hdwmy (const char *nptr)
 
 	switch (endptr[0]) {
 	case 'h': /* hour */
+	case 'H':
 		delta = num * 60 * 60; break;
 	case 'd': /* day */
+	case 'D':
 		delta = num * 24 * 60 * 60; break;
 	case 'w': /* week */
+	case 'W':
 		delta = num * 7 * 24 * 60 * 60; break;
 	case 'm': /* month */
+	case 'M':
 		delta = num * 30 * 24 * 60 * 60; break;
 	case 'y': /* year */
+	case 'Y':
 		delta = num * 365 * 24 * 60 * 60; break;
 	default:
 		return never;
diff --git a/lib/mu-str.c b/lib/mu-str.c
index e07add07..0a5e510d 100644
--- a/lib/mu-str.c
+++ b/lib/mu-str.c
@@ -586,7 +586,9 @@ process_str (const char *str, gboolean xapian_esc, gboolean query_esc)
 		if (g_unichar_ismark(uc))
 			continue;
 
-		uc = g_unichar_tolower (uc);
+		if (!is_range_field)
+			uc = g_unichar_tolower (uc);
+		
 		g_string_append_unichar (gstr, uc);
 	}