Improvements to maximum time in vehicle

Continuing the discussion from New feature: maximum time in vehicle: