Puppet Filtering: Fixing a couple bugs