diff --git a/main.py b/main.py
index 82bbce6..a12c92a 100644
--- a/main.py
+++ b/main.py
@@ -225,8 +225,9 @@ def application(env, re):
    return
 
   on = args["on"][0] if "on" in args else None
-  frm = on if on else args["from"][0] if "from" in args else None
-  to = on if on else args["to"][0] if "to" in args else None
+  since = args["since"][0] if "since" in args else None
+  frm = since if since else on if on else args["from"][0] if "from" in args else None
+  to = None if since else on if on else args["to"][0] if "to" in args else None
 
   if not "format" in args or args["format"][0] in ("json", "gjson", "geojson", "gj") or not args["format"]:
    builder = buildGJSON