Re-organize matching values