Improve filter management
Remove unused routes