Improve follow component routing