Tidy up AnnoucementFilterOption