Cleaned up filter usage