Improve filter settings and filter widget