Issue #85, filtering now includes infinite scrolling