Changing filters to use haystack