Include formatting option, fix duplicate detection