Altered filter options to match other implementations