Filtering fixes

Everything seems to be working properly now.