fix Filter + update data