diff --git a/src/main/java/caosdb/server/query/CQLParser.g4 b/src/main/java/caosdb/server/query/CQLParser.g4
index af981d6a2d027892c144070323aa924a5d7674a5..1c9ed586f3e541fac4a1605096920f232f61b94c 100644
--- a/src/main/java/caosdb/server/query/CQLParser.g4
+++ b/src/main/java/caosdb/server/query/CQLParser.g4
@@ -190,7 +190,7 @@ transaction_time returns [String tqp]
 :
 	(
 		(ON | IN) 
-		(datetime {$tqp = $datetime.text;} 
+		(value {$tqp = $value.text;} 
 		| entity {$tqp = $entity.ep.toString();})
 	) | TODAY {$tqp = TransactionFilter.TODAY;} 
 ;
@@ -244,8 +244,8 @@ pov returns [POV filter] locals [Query.Pattern p, String o, String v, String a]
 			)
 			| IS_NULL {$o = "0";}
 			| IS_NOT_NULL {$o = "!0";}
-			| IN datetime {$o = "("; $v=$datetime.text;}
-			| NEGATION IN datetime {$o = "!("; $v=$datetime.text;}
+			| IN value {$o = "("; $v=$value.str;}
+			| NEGATION IN value {$o = "!("; $v=$value.str;}
 		)?
 	) 
 	| 
@@ -443,7 +443,7 @@ minmax returns [String agg]
 value returns [String str]
 : 
 	number {$str = $text;}
-	| datetime {$str = $text;}
+	| datetime {$str = $datetime.text; }
 	| atom {$str = $atom.ep.toString();}
 ;