Improve duplicate detection rules in EventImporter