This is the commit for updated conditions to address exception on filter adjustments