Better way to avoid duplicates while staying user-friendly