Added conditional filter section