Improved filters to be more understandable