Improve follow route functionality