Fix up grouping for the tagk pair ORs