Added condition for filter