Filtering added for conditions