need to fix filter
need to fix filter bug