Added better search criterion for time container