Yep, dupes needs a lot of work. Ideally, we'd compose all of these separate dupe issues into an 'epic' issue (as I think it's called), so they can all be tackled at the same time.