Searching for trips works. I think all the queries are good now.
fixing merge