diff --git a/query/parser.go b/query/parser.go
index 5abd6be66..a0a413877 100644
--- a/query/parser.go
+++ b/query/parser.go
@@ -82,7 +82,7 @@ func (self *QueryParser) Parse() (query *Query, err error) {
 	if token.Type != TYPE_LP {
 		return nil, fmt.Errorf("Expected '(', found token %v.", token)
 	}
-	const shortForm = "2006-01-02 15:04"
+	const shortForm = "2006-01-02T15:04"
 
 ArgLoop:
 	for {
diff --git a/query/planner.go b/query/planner.go
index b5bb77834..59aa46abd 100644
--- a/query/planner.go
+++ b/query/planner.go
@@ -359,6 +359,7 @@ func init() {
 	gob.Register(BaseQueryResult{})
 	gob.Register(SetQueryResult{})
 	gob.Register(GetQueryResult{})
+	gob.Register(RangeQueryResult{})
 	gob.Register(CatQueryResult{})
 	gob.Register(UnionQueryResult{})
 	gob.Register(IntersectQueryResult{})
@@ -368,6 +369,7 @@ func init() {
 
 	gob.Register(SetQueryStep{})
 	gob.Register(GetQueryStep{})
+	gob.Register(RangeQueryStep{})
 	gob.Register(CatQueryStep{})
 	gob.Register(UnionQueryStep{})
 	gob.Register(IntersectQueryStep{})