Improve filter buttons