Fixed filtering to use AND
Merge pull request #503 from robhudson/fix-filter

Fixed filtering to use AND