updates, fix filter issue