Flex report: continued redesign of data collection
Add back undup_riders query for trips