Rework event list to return all events by state, and zone list to account for all states.