Reimplement date/time filter. See #2