diff --git a/org-ql.el b/org-ql.el
index 0cf6c8a9..c6fa7681 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -159,7 +159,8 @@ regexps.")
 Includes leading space character.")
 
 (defvar org-ql-regexp-part-ts-time
-  (rx " " (repeat 1 2 digit) ":" (repeat 2 digit))
+  (rx " " (repeat 1 2 digit) ":" (repeat 2 digit)
+      (optional "-" (repeat 1 2 digit) ":" (repeat 2 digit)))
   "Matches the inner, time part of an Org timestamp (i.e. HH:MM).
 Includes leading space character.  Used to build other timestamp
 regexps.")
@@ -825,7 +826,8 @@ respectively."
   (rx-to-string `(seq bol (group (zero-or-more (any "	 ")))
                       "#+begin_src"
                       (one-or-more (any "	 "))
-                      ,(or lang `(1+ (not (any "	\n\f "))))
+                      ,(or lang `(1+ (not (any "	\n\f
+ "))))
                       (zero-or-more (any "	 "))
                       (group (or (seq (zero-or-more (not (any "\n\":")))
                                       "\""
@@ -834,7 +836,7 @@ respectively."
                                       (zero-or-more (not (any "\n\":"))))
                                  (zero-or-more (not (any "\n\":")))))
                       (group (zero-or-more (not (any "\n")))) "\n"
-                      (63 (group (*\? (not (any " "))) "\n"))
+                      (63 (group (*\? (not (any "�"))) "\n"))
                       (zero-or-more (any "	 "))
                       "#+end_src")
                 t))