Filter: Bug fix and Randy test code