Improve filter flow
Improve filter flow