Fix surveys vs trips