Fixes #30

-Before and -After now filter other results instead of adding more data