fix filter and test