CLC-1210 Filter out duplicate orgs; tweak logs