Improve announcements searching