Extend support for AND logic to tags and across multiple tax/erm queries (updates #4)