Filter gets applied when dataset changes

Closes issue #507