[BUG FIXES] (Amber) Fixing back links on journeys and steps