#42 removing filter if needed