Fix issues with filtering incorrect value keys
Merge pull request #46 from bpedman/2013.04.3

Fix issues with filtering incorrect value keys