Issue #233 #237 #238 #239 - added DB fields for duplicates