Added support for AND and OR taxonomy filtering.  Default to AND (was OR)