Improve filter support