fix issues about filtering