added bugfix for canonical email column
code refactoring for pseudo-nullable canonical email column