Backport changes to terms to the uniques panel