Fix to match if all attributes match only (previously matched if only one attribute was matching)