Improved setting filter
Sample improved