This fixes #8153.  It now correctly does the filter.