Steve/feature/trip import fix