Fixed bug with optional time searching