Make sure journey JSON always includes waypoints