Fixing the issues after review in time check and type checks
and adding enter event to each time (bug 2407)