Fix queries on orgs that need to look at multiple schedules (not just the first)
working on new UI