Resolves #2688 - w/ filter