Filters fixed

Finally