improve filter & sort tools