Announcements and events filter form cleanup.