[FIX] only match references when partners match (if any)