Adding Filter Fix