Fix Announcement Filtering

Changes to Announcement filters in getAnnouncementClass() and
UpcomingAnnouncements()