Improved filters functionality