When the user is showing "...do you want to show them all" message, instead of using the 1minutes as the time declutter time, we do the calculation to make the final time step smaller than 100 if the user selects no as the answer. This can make Brian's life easer.
Merge remote-tracking branch 'origin/master'