Rework routing & links for trips