some changes to filter