changed location to location_id for trips