Fixed filtering to use AND

This is the better way to do AND filtering.