maybe fixed the filtering