Fix delete, fix filter