improve Unique handling