added trip, fixed query