fix issue with filtering