#421 - Fix route calculation, add 6 mins when using driving