Modified the main (new) query to no longer include event_type. Still testing to do to ensure switch away from Activities table truly works.