diff --git a/resources/lib/criterion_parser.py b/resources/lib/criterion_parser.py
index 25e95a8..f806162 100644
--- a/resources/lib/criterion_parser.py
+++ b/resources/lib/criterion_parser.py
@@ -8,12 +8,14 @@ def parse(criterions):
         if criterion in ('sceneIsMissing', 'imageIsMissing', 'performerIsMissing', 'galleryIsMissing', 'tagIsMissing', 'studioIsMissing', 'studioIsMissing'):
             filter['is_missing'] = criterion['value']
         else:
-            filter[criterion] = parse_criterion(criterions[criterion])
+            is_timestamp_field = criterion in ('created_at', 'updated_at', 'scene_created_at', 'scene_updated_at')
+            value_transformer = (lambda v: v.replace(' ', 'T') if isinstance(v, str) else v) if is_timestamp_field else lambda v: v
+            filter[criterion] = parse_criterion(criterions[criterion], value_transformer)
 
     return filter
 
 
-def parse_criterion(criterion):
+def parse_criterion(criterion, value_transformer):
     filter = {}
 
     filter['modifier'] = criterion['modifier']
@@ -28,13 +30,15 @@ def parse_criterion(criterion):
 
         filter['depth'] = value['depth']
     elif isinstance(value, dict) and not value.keys() - ['value', 'value2']:
-        filter.update(value)
+        filter['value'] = value_transformer(value['value'])
+        if 'value2' in value:
+            filter['value2'] = value_transformer(value['value2'])
     elif isinstance(value, list):
         filter['value'] = list(map(lambda v: v['id'], value))
     elif isinstance(value, dict) and not value.keys() - ['endpoint', 'stashID']:
         filter['endpoint'] = value.get('endpoint')
         filter['stash_id'] = value.get('stashID')
     else:
-        filter['value'] = value
+        filter['value'] = value_transformer(value)
 
     return filter