Lookup handles dates, not datetimes
Cleanup time logic