Rework matching trips