Turn the filter off while we're running it...
Move filter dance into if()
Merge pull request #18 from Camwyn/infinite-recursion

Turn the filter off while we're running it...