Fix filters bug

Bug was filtering by class *and* usage didn't work